Merge remote-tracking branch 'remotes/origin/zzc/dev/param_cfg' into main_f413
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
<TargetName>rt-thread</TargetName>
|
||||
<ToolsetNumber>0x4</ToolsetNumber>
|
||||
<ToolsetName>ARM-ADS</ToolsetName>
|
||||
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
|
||||
<pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
|
||||
<uAC6>0</uAC6>
|
||||
<TargetOption>
|
||||
<TargetCommonOption>
|
||||
@@ -54,7 +54,7 @@
|
||||
<CreateLib>1</CreateLib>
|
||||
<CreateHexFile>0</CreateHexFile>
|
||||
<DebugInformation>1</DebugInformation>
|
||||
<BrowseInformation>1</BrowseInformation>
|
||||
<BrowseInformation>0</BrowseInformation>
|
||||
<ListingPath>.\build\keil\List\</ListingPath>
|
||||
<HexFormatSelection>1</HexFormatSelection>
|
||||
<Merge32K>0</Merge32K>
|
||||
@@ -434,14 +434,9 @@
|
||||
<FilePath>rt-thread\components\libc\cplusplus\cxx_Thread.cpp</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>cxx_crt_init.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>rt-thread\components\libc\cplusplus\cxx_crt_init.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>cxx_Mutex.cpp</FileName>
|
||||
<FileName>cxx_Semaphore.cpp</FileName>
|
||||
<FileType>8</FileType>
|
||||
<FilePath>rt-thread\components\libc\cplusplus\cxx_Mutex.cpp</FilePath>
|
||||
<FilePath>rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>cxx_crt.cpp</FileName>
|
||||
@@ -449,9 +444,14 @@
|
||||
<FilePath>rt-thread\components\libc\cplusplus\cxx_crt.cpp</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>cxx_Semaphore.cpp</FileName>
|
||||
<FileName>cxx_Mutex.cpp</FileName>
|
||||
<FileType>8</FileType>
|
||||
<FilePath>rt-thread\components\libc\cplusplus\cxx_Semaphore.cpp</FilePath>
|
||||
<FilePath>rt-thread\components\libc\cplusplus\cxx_Mutex.cpp</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>cxx_crt_init.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>rt-thread\components\libc\cplusplus\cxx_crt_init.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
@@ -633,16 +633,16 @@
|
||||
<FileType>1</FileType>
|
||||
<FilePath>rt-thread\components\fal\src\fal_partition.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>fal_flash.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>rt-thread\components\fal\src\fal_flash.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>fal.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>rt-thread\components\fal\src\fal.c</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>fal_flash.c</FileName>
|
||||
<FileType>1</FileType>
|
||||
<FilePath>rt-thread\components\fal\src\fal_flash.c</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
Reference in New Issue
Block a user