Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
7577b1a373
File diff suppressed because it is too large
Load Diff
|
@ -17,7 +17,7 @@ elif CROSS_TOOL == 'keil':
|
||||||
EXEC_PATH = 'C:/Keil_v5'
|
EXEC_PATH = 'C:/Keil_v5'
|
||||||
elif CROSS_TOOL == 'iar':
|
elif CROSS_TOOL == 'iar':
|
||||||
PLATFORM = 'iar'
|
PLATFORM = 'iar'
|
||||||
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 7.0'
|
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
|
||||||
|
|
||||||
if os.getenv('RTT_EXEC_PATH'):
|
if os.getenv('RTT_EXEC_PATH'):
|
||||||
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
|
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="iso-8859-1"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<project>
|
<project>
|
||||||
<fileVersion>2</fileVersion>
|
<fileVersion>3</fileVersion>
|
||||||
<configuration>
|
<configuration>
|
||||||
<name>Debug</name>
|
<name>Debug</name>
|
||||||
<toolchain>
|
<toolchain>
|
||||||
|
@ -12,7 +11,7 @@
|
||||||
<name>General</name>
|
<name>General</name>
|
||||||
<archiveVersion>3</archiveVersion>
|
<archiveVersion>3</archiveVersion>
|
||||||
<data>
|
<data>
|
||||||
<version>22</version>
|
<version>28</version>
|
||||||
<wantNonLocal>1</wantNonLocal>
|
<wantNonLocal>1</wantNonLocal>
|
||||||
<debug>1</debug>
|
<debug>1</debug>
|
||||||
<option>
|
<option>
|
||||||
|
@ -27,45 +26,25 @@
|
||||||
<name>ListPath</name>
|
<name>ListPath</name>
|
||||||
<state>build\Debug\List</state>
|
<state>build\Debug\List</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>Variant</name>
|
|
||||||
<version>20</version>
|
|
||||||
<state>12</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>GEndianMode</name>
|
<name>GEndianMode</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>Input variant</name>
|
|
||||||
<version>3</version>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>Input description</name>
|
<name>Input description</name>
|
||||||
<state>Full formatting.</state>
|
<state>Full formatting, without multibyte support.</state>
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<name>Output variant</name>
|
|
||||||
<version>2</version>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>Output description</name>
|
<name>Output description</name>
|
||||||
<state>Full formatting.</state>
|
<state>Full formatting, without multibyte support.</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>GOutputBinary</name>
|
<name>GOutputBinary</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>FPU</name>
|
|
||||||
<version>2</version>
|
|
||||||
<state>0</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>OGCoreOrChip</name>
|
<name>OGCoreOrChip</name>
|
||||||
<state>1</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>GRuntimeLibSelect</name>
|
<name>GRuntimeLibSelect</name>
|
||||||
|
@ -87,7 +66,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OGLastSavedByProductVersion</name>
|
<name>OGLastSavedByProductVersion</name>
|
||||||
<state>7.20.1.7306</state>
|
<state>8.10.1.12859</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>GeneralEnableMisra</name>
|
<name>GeneralEnableMisra</name>
|
||||||
|
@ -135,14 +114,9 @@
|
||||||
<name>RTConfigPath2</name>
|
<name>RTConfigPath2</name>
|
||||||
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
|
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>GFPUCoreSlave</name>
|
|
||||||
<version>20</version>
|
|
||||||
<state>12</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>GBECoreSlave</name>
|
<name>GBECoreSlave</name>
|
||||||
<version>20</version>
|
<version>24</version>
|
||||||
<state>12</state>
|
<state>12</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
|
@ -157,13 +131,78 @@
|
||||||
<name>GRuntimeLibThreads</name>
|
<name>GRuntimeLibThreads</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CoreVariant</name>
|
||||||
|
<version>24</version>
|
||||||
|
<state>12</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GFPUDeviceSlave</name>
|
||||||
|
<state>AT91SAM9260 Atmel AT91SAM9260</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>FPU2</name>
|
||||||
|
<version>0</version>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>NrRegs</name>
|
||||||
|
<version>0</version>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>NEON</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GFPUCoreSlave2</name>
|
||||||
|
<version>24</version>
|
||||||
|
<state>12</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGCMSISPackSelectDevice</name>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OgLibHeap</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGLibAdditionalLocale</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGPrintfVariant</name>
|
||||||
|
<version>0</version>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGPrintfMultibyteSupport</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGScanfVariant</name>
|
||||||
|
<version>0</version>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGScanfMultibyteSupport</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GenLocaleTags</name>
|
||||||
|
<state></state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GenLocaleDisplayOnly</name>
|
||||||
|
<state></state>
|
||||||
|
</option>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
<settings>
|
<settings>
|
||||||
<name>ICCARM</name>
|
<name>ICCARM</name>
|
||||||
<archiveVersion>2</archiveVersion>
|
<archiveVersion>2</archiveVersion>
|
||||||
<data>
|
<data>
|
||||||
<version>31</version>
|
<version>34</version>
|
||||||
<wantNonLocal>1</wantNonLocal>
|
<wantNonLocal>1</wantNonLocal>
|
||||||
<debug>1</debug>
|
<debug>1</debug>
|
||||||
<option>
|
<option>
|
||||||
|
@ -267,10 +306,6 @@
|
||||||
<name>CCRequirePrototypes</name>
|
<name>CCRequirePrototypes</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>CCMultibyteSupport</name>
|
|
||||||
<state>0</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>CCDiagWarnAreErr</name>
|
<name>CCDiagWarnAreErr</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
|
@ -311,10 +346,6 @@
|
||||||
<name>CCCodeSection</name>
|
<name>CCCodeSection</name>
|
||||||
<state>.text</state>
|
<state>.text</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>IInterwork2</name>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>IProcessorMode2</name>
|
<name>IProcessorMode2</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
|
@ -366,18 +397,6 @@
|
||||||
<name>IccAllowVLA</name>
|
<name>IccAllowVLA</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>IccCppDialect</name>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<name>IccExceptions</name>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<name>IccRTTI</name>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>IccStaticDestr</name>
|
<name>IccStaticDestr</name>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
|
@ -407,13 +426,37 @@
|
||||||
<name>CCGuardCalls</name>
|
<name>CCGuardCalls</name>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CCEncSource</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CCEncOutput</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CCEncOutputBom</name>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CCEncInput</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IccExceptions2</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IccRTTI2</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
<settings>
|
<settings>
|
||||||
<name>AARM</name>
|
<name>AARM</name>
|
||||||
<archiveVersion>2</archiveVersion>
|
<archiveVersion>2</archiveVersion>
|
||||||
<data>
|
<data>
|
||||||
<version>9</version>
|
<version>10</version>
|
||||||
<wantNonLocal>1</wantNonLocal>
|
<wantNonLocal>1</wantNonLocal>
|
||||||
<debug>1</debug>
|
<debug>1</debug>
|
||||||
<option>
|
<option>
|
||||||
|
@ -541,10 +584,6 @@
|
||||||
<name>AOutputFile</name>
|
<name>AOutputFile</name>
|
||||||
<state>$FILE_BNAME$.o</state>
|
<state>$FILE_BNAME$.o</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>AMultibyteSupport</name>
|
|
||||||
<state>0</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>ALimitErrorsCheck</name>
|
<name>ALimitErrorsCheck</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
|
@ -559,7 +598,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>AUserIncludes</name>
|
<name>AUserIncludes</name>
|
||||||
<state></state>
|
<state>D:\GitHub\rt-thread\bsp\asm9260t\platform</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>AExtraOptionsCheckV2</name>
|
<name>AExtraOptionsCheckV2</name>
|
||||||
|
@ -584,8 +623,8 @@
|
||||||
<debug>1</debug>
|
<debug>1</debug>
|
||||||
<option>
|
<option>
|
||||||
<name>OOCOutputFormat</name>
|
<name>OOCOutputFormat</name>
|
||||||
<version>2</version>
|
<version>3</version>
|
||||||
<state>2</state>
|
<state>3</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OCOutputOverride</name>
|
<name>OCOutputOverride</name>
|
||||||
|
@ -611,6 +650,7 @@
|
||||||
<data>
|
<data>
|
||||||
<extensions></extensions>
|
<extensions></extensions>
|
||||||
<cmdline></cmdline>
|
<cmdline></cmdline>
|
||||||
|
<hasPrio>0</hasPrio>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
<settings>
|
<settings>
|
||||||
|
@ -630,7 +670,7 @@
|
||||||
<name>ILINK</name>
|
<name>ILINK</name>
|
||||||
<archiveVersion>0</archiveVersion>
|
<archiveVersion>0</archiveVersion>
|
||||||
<data>
|
<data>
|
||||||
<version>16</version>
|
<version>20</version>
|
||||||
<wantNonLocal>1</wantNonLocal>
|
<wantNonLocal>1</wantNonLocal>
|
||||||
<debug>1</debug>
|
<debug>1</debug>
|
||||||
<option>
|
<option>
|
||||||
|
@ -711,7 +751,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>IlinkIcfFile</name>
|
<name>IlinkIcfFile</name>
|
||||||
<state>D:\Proj_SRMR\Firmware\bsp\at91sam9260\at91sam9260_ram.icf</state>
|
<state>D:\GitHub\rt-thread\bsp\asm9260t\link_scripts\sdram.icf</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>IlinkIcfFileSlave</name>
|
<name>IlinkIcfFileSlave</name>
|
||||||
|
@ -902,7 +942,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>CrcAlgorithm</name>
|
<name>CrcAlgorithm</name>
|
||||||
<version>0</version>
|
<version>1</version>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
|
@ -914,6 +954,34 @@
|
||||||
<name>IlinkThreadsSlave</name>
|
<name>IlinkThreadsSlave</name>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkLogCallGraph</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkIcfFile_AltDefault</name>
|
||||||
|
<state></state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkEncInput</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkEncOutput</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkEncOutputBom</name>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkHeapSelect</name>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkLocaleSelect</name>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
<settings>
|
<settings>
|
||||||
|
@ -953,7 +1021,7 @@
|
||||||
<name>General</name>
|
<name>General</name>
|
||||||
<archiveVersion>3</archiveVersion>
|
<archiveVersion>3</archiveVersion>
|
||||||
<data>
|
<data>
|
||||||
<version>22</version>
|
<version>28</version>
|
||||||
<wantNonLocal>1</wantNonLocal>
|
<wantNonLocal>1</wantNonLocal>
|
||||||
<debug>0</debug>
|
<debug>0</debug>
|
||||||
<option>
|
<option>
|
||||||
|
@ -968,29 +1036,14 @@
|
||||||
<name>ListPath</name>
|
<name>ListPath</name>
|
||||||
<state>Release\List</state>
|
<state>Release\List</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>Variant</name>
|
|
||||||
<version>20</version>
|
|
||||||
<state>0</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>GEndianMode</name>
|
<name>GEndianMode</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>Input variant</name>
|
|
||||||
<version>3</version>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>Input description</name>
|
<name>Input description</name>
|
||||||
<state>Full formatting.</state>
|
<state>Full formatting.</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>Output variant</name>
|
|
||||||
<version>2</version>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>Output description</name>
|
<name>Output description</name>
|
||||||
<state>Full formatting.</state>
|
<state>Full formatting.</state>
|
||||||
|
@ -999,11 +1052,6 @@
|
||||||
<name>GOutputBinary</name>
|
<name>GOutputBinary</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>FPU</name>
|
|
||||||
<version>2</version>
|
|
||||||
<state>0</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>OGCoreOrChip</name>
|
<name>OGCoreOrChip</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
|
@ -1028,7 +1076,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>OGLastSavedByProductVersion</name>
|
<name>OGLastSavedByProductVersion</name>
|
||||||
<state>6.30.1.53141</state>
|
<state>8.10.1.12859</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>GeneralEnableMisra</name>
|
<name>GeneralEnableMisra</name>
|
||||||
|
@ -1076,14 +1124,9 @@
|
||||||
<name>RTConfigPath2</name>
|
<name>RTConfigPath2</name>
|
||||||
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
|
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>GFPUCoreSlave</name>
|
|
||||||
<version>20</version>
|
|
||||||
<state>0</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>GBECoreSlave</name>
|
<name>GBECoreSlave</name>
|
||||||
<version>20</version>
|
<version>24</version>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
|
@ -1098,13 +1141,78 @@
|
||||||
<name>GRuntimeLibThreads</name>
|
<name>GRuntimeLibThreads</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CoreVariant</name>
|
||||||
|
<version>24</version>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GFPUDeviceSlave</name>
|
||||||
|
<state>default None</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>FPU2</name>
|
||||||
|
<version>0</version>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>NrRegs</name>
|
||||||
|
<version>0</version>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>NEON</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GFPUCoreSlave2</name>
|
||||||
|
<version>24</version>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGCMSISPackSelectDevice</name>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OgLibHeap</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGLibAdditionalLocale</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGPrintfVariant</name>
|
||||||
|
<version>0</version>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGPrintfMultibyteSupport</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGScanfVariant</name>
|
||||||
|
<version>0</version>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>OGScanfMultibyteSupport</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GenLocaleTags</name>
|
||||||
|
<state></state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>GenLocaleDisplayOnly</name>
|
||||||
|
<state></state>
|
||||||
|
</option>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
<settings>
|
<settings>
|
||||||
<name>ICCARM</name>
|
<name>ICCARM</name>
|
||||||
<archiveVersion>2</archiveVersion>
|
<archiveVersion>2</archiveVersion>
|
||||||
<data>
|
<data>
|
||||||
<version>31</version>
|
<version>34</version>
|
||||||
<wantNonLocal>1</wantNonLocal>
|
<wantNonLocal>1</wantNonLocal>
|
||||||
<debug>0</debug>
|
<debug>0</debug>
|
||||||
<option>
|
<option>
|
||||||
|
@ -1208,10 +1316,6 @@
|
||||||
<name>CCRequirePrototypes</name>
|
<name>CCRequirePrototypes</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>CCMultibyteSupport</name>
|
|
||||||
<state>0</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>CCDiagWarnAreErr</name>
|
<name>CCDiagWarnAreErr</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
|
@ -1252,10 +1356,6 @@
|
||||||
<name>CCCodeSection</name>
|
<name>CCCodeSection</name>
|
||||||
<state>.text</state>
|
<state>.text</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>IInterwork2</name>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>IProcessorMode2</name>
|
<name>IProcessorMode2</name>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
|
@ -1307,18 +1407,6 @@
|
||||||
<name>IccAllowVLA</name>
|
<name>IccAllowVLA</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>IccCppDialect</name>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<name>IccExceptions</name>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
|
||||||
<name>IccRTTI</name>
|
|
||||||
<state>1</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>IccStaticDestr</name>
|
<name>IccStaticDestr</name>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
|
@ -1348,13 +1436,37 @@
|
||||||
<name>CCGuardCalls</name>
|
<name>CCGuardCalls</name>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CCEncSource</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CCEncOutput</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CCEncOutputBom</name>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>CCEncInput</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IccExceptions2</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IccRTTI2</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
<settings>
|
<settings>
|
||||||
<name>AARM</name>
|
<name>AARM</name>
|
||||||
<archiveVersion>2</archiveVersion>
|
<archiveVersion>2</archiveVersion>
|
||||||
<data>
|
<data>
|
||||||
<version>9</version>
|
<version>10</version>
|
||||||
<wantNonLocal>1</wantNonLocal>
|
<wantNonLocal>1</wantNonLocal>
|
||||||
<debug>0</debug>
|
<debug>0</debug>
|
||||||
<option>
|
<option>
|
||||||
|
@ -1482,10 +1594,6 @@
|
||||||
<name>AOutputFile</name>
|
<name>AOutputFile</name>
|
||||||
<state>$FILE_BNAME$.o</state>
|
<state>$FILE_BNAME$.o</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
|
||||||
<name>AMultibyteSupport</name>
|
|
||||||
<state>0</state>
|
|
||||||
</option>
|
|
||||||
<option>
|
<option>
|
||||||
<name>ALimitErrorsCheck</name>
|
<name>ALimitErrorsCheck</name>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
|
@ -1525,7 +1633,7 @@
|
||||||
<debug>0</debug>
|
<debug>0</debug>
|
||||||
<option>
|
<option>
|
||||||
<name>OOCOutputFormat</name>
|
<name>OOCOutputFormat</name>
|
||||||
<version>2</version>
|
<version>3</version>
|
||||||
<state>0</state>
|
<state>0</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
|
@ -1552,6 +1660,7 @@
|
||||||
<data>
|
<data>
|
||||||
<extensions></extensions>
|
<extensions></extensions>
|
||||||
<cmdline></cmdline>
|
<cmdline></cmdline>
|
||||||
|
<hasPrio>0</hasPrio>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
<settings>
|
<settings>
|
||||||
|
@ -1571,7 +1680,7 @@
|
||||||
<name>ILINK</name>
|
<name>ILINK</name>
|
||||||
<archiveVersion>0</archiveVersion>
|
<archiveVersion>0</archiveVersion>
|
||||||
<data>
|
<data>
|
||||||
<version>16</version>
|
<version>20</version>
|
||||||
<wantNonLocal>1</wantNonLocal>
|
<wantNonLocal>1</wantNonLocal>
|
||||||
<debug>0</debug>
|
<debug>0</debug>
|
||||||
<option>
|
<option>
|
||||||
|
@ -1843,7 +1952,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>CrcAlgorithm</name>
|
<name>CrcAlgorithm</name>
|
||||||
<version>0</version>
|
<version>1</version>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
|
@ -1855,6 +1964,34 @@
|
||||||
<name>IlinkThreadsSlave</name>
|
<name>IlinkThreadsSlave</name>
|
||||||
<state>1</state>
|
<state>1</state>
|
||||||
</option>
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkLogCallGraph</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkIcfFile_AltDefault</name>
|
||||||
|
<state></state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkEncInput</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkEncOutput</name>
|
||||||
|
<state>0</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkEncOutputBom</name>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkHeapSelect</name>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
|
<option>
|
||||||
|
<name>IlinkLocaleSelect</name>
|
||||||
|
<state>1</state>
|
||||||
|
</option>
|
||||||
</data>
|
</data>
|
||||||
</settings>
|
</settings>
|
||||||
<settings>
|
<settings>
|
||||||
|
@ -1885,5 +2022,3 @@
|
||||||
</settings>
|
</settings>
|
||||||
</configuration>
|
</configuration>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,7 @@ from building import *
|
||||||
cwd = GetCurrentDir()
|
cwd = GetCurrentDir()
|
||||||
src = Glob('driverlib/*.c')
|
src = Glob('driverlib/*.c')
|
||||||
SrcRemove(src, 'onewire.c')
|
SrcRemove(src, 'onewire.c')
|
||||||
|
CCFLAGS = ''
|
||||||
|
|
||||||
# add for startup script
|
# add for startup script
|
||||||
if rtconfig.CROSS_TOOL == 'gcc':
|
if rtconfig.CROSS_TOOL == 'gcc':
|
||||||
|
@ -14,10 +15,12 @@ elif rtconfig.CROSS_TOOL == 'keil':
|
||||||
src += ['startup/startup_rvmdk.S']
|
src += ['startup/startup_rvmdk.S']
|
||||||
elif rtconfig.CROSS_TOOL == 'iar':
|
elif rtconfig.CROSS_TOOL == 'iar':
|
||||||
src += ['startup/startup_ewarm.c']
|
src += ['startup/startup_ewarm.c']
|
||||||
|
CCFLAGS += ' --diag_suppress=pe177'
|
||||||
|
|
||||||
CPPPATH = [cwd, cwd + '/inc', cwd + '/driverlib']
|
CPPPATH = [cwd, cwd + '/inc', cwd + '/driverlib']
|
||||||
|
|
||||||
|
|
||||||
CPPDEFINES = [rtconfig.PART_TYPE]
|
CPPDEFINES = [rtconfig.PART_TYPE]
|
||||||
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES)
|
group = DefineGroup('Libraries', src, depend = [''], CPPPATH = CPPPATH, CPPDEFINES = CPPDEFINES, CCFLAGS = CCFLAGS)
|
||||||
|
|
||||||
Return('group')
|
Return('group')
|
||||||
|
|
|
@ -19,12 +19,10 @@ if CROSS_TOOL == 'gcc':
|
||||||
EXEC_PATH = r'D:\ArdaArmTools\Sourcery_Lite\bin'
|
EXEC_PATH = r'D:\ArdaArmTools\Sourcery_Lite\bin'
|
||||||
elif CROSS_TOOL == 'keil':
|
elif CROSS_TOOL == 'keil':
|
||||||
PLATFORM = 'armcc'
|
PLATFORM = 'armcc'
|
||||||
EXEC_PATH = r'D:\Keil_v5'
|
EXEC_PATH = r'C:\Keil_v5'
|
||||||
elif CROSS_TOOL == 'iar':
|
elif CROSS_TOOL == 'iar':
|
||||||
print('================ERROR============================')
|
PLATFORM = 'iar'
|
||||||
print('Not support iar yet!')
|
EXEC_PATH = 'C:/Program Files (x86)/IAR Systems/Embedded Workbench 8.0'
|
||||||
print('=================================================')
|
|
||||||
exit(0)
|
|
||||||
|
|
||||||
if os.getenv('RTT_EXEC_PATH'):
|
if os.getenv('RTT_EXEC_PATH'):
|
||||||
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
|
EXEC_PATH = os.getenv('RTT_EXEC_PATH')
|
||||||
|
@ -85,3 +83,51 @@ elif PLATFORM == 'armcc':
|
||||||
CFLAGS += ' -O2'
|
CFLAGS += ' -O2'
|
||||||
|
|
||||||
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
|
POST_ACTION = 'fromelf --bin $TARGET --output rtthread.bin \nfromelf -z $TARGET'
|
||||||
|
|
||||||
|
elif PLATFORM == 'iar':
|
||||||
|
# toolchains
|
||||||
|
CC = 'iccarm'
|
||||||
|
AS = 'iasmarm'
|
||||||
|
AR = 'iarchive'
|
||||||
|
LINK = 'ilinkarm'
|
||||||
|
TARGET_EXT = 'out'
|
||||||
|
|
||||||
|
DEVICE = '-Dewarm' # + ' -D' + PART_TYPE
|
||||||
|
|
||||||
|
CFLAGS = DEVICE
|
||||||
|
CFLAGS += ' --diag_suppress Pa050'
|
||||||
|
CFLAGS += ' --no_cse'
|
||||||
|
CFLAGS += ' --no_unroll'
|
||||||
|
CFLAGS += ' --no_inline'
|
||||||
|
CFLAGS += ' --no_code_motion'
|
||||||
|
CFLAGS += ' --no_tbaa'
|
||||||
|
CFLAGS += ' --no_clustering'
|
||||||
|
CFLAGS += ' --no_scheduling'
|
||||||
|
|
||||||
|
CFLAGS += ' --endian=little'
|
||||||
|
CFLAGS += ' --cpu=Cortex-M4'
|
||||||
|
CFLAGS += ' -e'
|
||||||
|
CFLAGS += ' --fpu=VFPv4_sp'
|
||||||
|
CFLAGS += ' --dlib_config "' + EXEC_PATH + '/arm/INC/c/DLib_Config_Normal.h"'
|
||||||
|
CFLAGS += ' --silent'
|
||||||
|
|
||||||
|
AFLAGS = DEVICE
|
||||||
|
AFLAGS += ' -s+'
|
||||||
|
AFLAGS += ' -w+'
|
||||||
|
AFLAGS += ' -r'
|
||||||
|
AFLAGS += ' --cpu Cortex-M4'
|
||||||
|
AFLAGS += ' --fpu VFPv4_sp'
|
||||||
|
AFLAGS += ' -S'
|
||||||
|
|
||||||
|
if BUILD == 'debug':
|
||||||
|
CFLAGS += ' --debug'
|
||||||
|
CFLAGS += ' -On'
|
||||||
|
else:
|
||||||
|
CFLAGS += ' -Oh'
|
||||||
|
|
||||||
|
LFLAGS = ' --config "tm4c_rom.icf"'
|
||||||
|
LFLAGS += ' --entry __iar_program_start'
|
||||||
|
#LFLAGS += ' --silent'
|
||||||
|
|
||||||
|
EXEC_PATH = EXEC_PATH + '/arm/bin/'
|
||||||
|
POST_ACTION = ''
|
|
@ -20,7 +20,10 @@ struct timeval {
|
||||||
};
|
};
|
||||||
#endif /* _TIMEVAL_DEFINED */
|
#endif /* _TIMEVAL_DEFINED */
|
||||||
|
|
||||||
#if defined ( __ICCARM__ ) && (__VER__ >= 8011002)
|
/*
|
||||||
|
* Skip define timespec for IAR version over 8.10.1 where __VER__ is 8010001.
|
||||||
|
*/
|
||||||
|
#if defined ( __ICCARM__ ) && (__VER__ >= 8010001)
|
||||||
#define _TIMESPEC_DEFINED
|
#define _TIMESPEC_DEFINED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue