aboutsummaryrefslogtreecommitdiffstats
path: root/demos/STM32
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2015-07-07 09:26:14 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2015-07-07 09:26:14 +0000
commit26067f6954cb002bca1c796b96bc7c36149b5e58 (patch)
tree16e1f24376f398c8d5533b66766786b6ca5a84b5 /demos/STM32
parent151e9e60ec4af4a599ac98ea27c8642eed1e75e0 (diff)
downloadChibiOS-26067f6954cb002bca1c796b96bc7c36149b5e58.tar.gz
ChibiOS-26067f6954cb002bca1c796b96bc7c36149b5e58.tar.bz2
ChibiOS-26067f6954cb002bca1c796b96bc7c36149b5e58.zip
STM32F3xx reports.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8067 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos/STM32')
-rw-r--r--demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp146
-rw-r--r--demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvprojx (renamed from demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvproj)15
2 files changed, 109 insertions, 52 deletions
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp b/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp
index 53036912c..b101744a7 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/iar/ch.ewp
@@ -12,7 +12,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>22</version>
+ <version>24</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -28,11 +28,6 @@
<state>Debug\List</state>
</option>
<option>
- <name>Variant</name>
- <version>20</version>
- <state>40</state>
- </option>
- <option>
<name>GEndianMode</name>
<state>0</state>
</option>
@@ -59,11 +54,6 @@
<state>0</state>
</option>
<option>
- <name>FPU</name>
- <version>2</version>
- <state>5</state>
- </option>
- <option>
<name>OGCoreOrChip</name>
<state>1</state>
</option>
@@ -87,7 +77,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.70.3.6347</state>
+ <state>7.40.3.8937</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -136,13 +126,8 @@
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
<option>
- <name>GFPUCoreSlave</name>
- <version>20</version>
- <state>40</state>
- </option>
- <option>
<name>GBECoreSlave</name>
- <version>20</version>
+ <version>22</version>
<state>40</state>
</option>
<option>
@@ -157,13 +142,41 @@
<name>GRuntimeLibThreads</name>
<state>0</state>
</option>
+ <option>
+ <name>CoreVariant</name>
+ <version>22</version>
+ <state>39</state>
+ </option>
+ <option>
+ <name>GFPUDeviceSlave</name>
+ <state>STM32F303xC ST STM32F303xC</state>
+ </option>
+ <option>
+ <name>FPU2</name>
+ <version>0</version>
+ <state>4</state>
+ </option>
+ <option>
+ <name>NrRegs</name>
+ <version>0</version>
+ <state>1</state>
+ </option>
+ <option>
+ <name>NEON</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GFPUCoreSlave2</name>
+ <version>22</version>
+ <state>39</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>29</version>
+ <version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>1</debug>
<option>
@@ -172,7 +185,7 @@
</option>
<option>
<name>CCDefines</name>
- <state>CORTEX_USE_FPU=TRUE</state>
+ <state></state>
</option>
<option>
<name>CCPreprocFile</name>
@@ -233,7 +246,7 @@
<option>
<name>CCAllowList</name>
<version>1</version>
- <state>0000000</state>
+ <state>00000000</state>
</option>
<option>
<name>CCDebugInfo</name>
@@ -418,6 +431,15 @@
<name>CCNoLiteralPool</name>
<state>0</state>
</option>
+ <option>
+ <name>CCOptStrategySlave</name>
+ <version>0</version>
+ <state>0</state>
+ </option>
+ <option>
+ <name>CCGuardCalls</name>
+ <state>1</state>
+ </option>
</data>
</settings>
<settings>
@@ -474,7 +496,7 @@
</option>
<option>
<name>ADefines</name>
- <state>CORTEX_USE_FPU=TRUE</state>
+ <state></state>
</option>
<option>
<name>AList</name>
@@ -597,7 +619,7 @@
<debug>1</debug>
<option>
<name>OOCOutputFormat</name>
- <version>2</version>
+ <version>3</version>
<state>0</state>
</option>
<option>
@@ -624,6 +646,7 @@
<data>
<extensions></extensions>
<cmdline></cmdline>
+ <hasPrio>0</hasPrio>
</data>
</settings>
<settings>
@@ -966,7 +989,7 @@
<name>General</name>
<archiveVersion>3</archiveVersion>
<data>
- <version>22</version>
+ <version>24</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -982,11 +1005,6 @@
<state>Release\List</state>
</option>
<option>
- <name>Variant</name>
- <version>20</version>
- <state>40</state>
- </option>
- <option>
<name>GEndianMode</name>
<state>0</state>
</option>
@@ -1013,11 +1031,6 @@
<state>0</state>
</option>
<option>
- <name>FPU</name>
- <version>2</version>
- <state>5</state>
- </option>
- <option>
<name>OGCoreOrChip</name>
<state>1</state>
</option>
@@ -1041,7 +1054,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
- <state>6.70.3.6347</state>
+ <state>7.40.3.8937</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@@ -1090,14 +1103,9 @@
<state>$TOOLKIT_DIR$\INC\c\DLib_Config_Normal.h</state>
</option>
<option>
- <name>GFPUCoreSlave</name>
- <version>20</version>
- <state>40</state>
- </option>
- <option>
<name>GBECoreSlave</name>
- <version>20</version>
- <state>40</state>
+ <version>22</version>
+ <state>39</state>
</option>
<option>
<name>OGUseCmsis</name>
@@ -1111,13 +1119,41 @@
<name>GRuntimeLibThreads</name>
<state>0</state>
</option>
+ <option>
+ <name>CoreVariant</name>
+ <version>22</version>
+ <state>39</state>
+ </option>
+ <option>
+ <name>GFPUDeviceSlave</name>
+ <state>STM32F303xC ST STM32F303xC</state>
+ </option>
+ <option>
+ <name>FPU2</name>
+ <version>0</version>
+ <state>4</state>
+ </option>
+ <option>
+ <name>NrRegs</name>
+ <version>0</version>
+ <state>1</state>
+ </option>
+ <option>
+ <name>NEON</name>
+ <state>0</state>
+ </option>
+ <option>
+ <name>GFPUCoreSlave2</name>
+ <version>22</version>
+ <state>39</state>
+ </option>
</data>
</settings>
<settings>
<name>ICCARM</name>
<archiveVersion>2</archiveVersion>
<data>
- <version>29</version>
+ <version>31</version>
<wantNonLocal>1</wantNonLocal>
<debug>0</debug>
<option>
@@ -1126,7 +1162,7 @@
</option>
<option>
<name>CCDefines</name>
- <state>CORTEX_USE_FPU=TRUE</state>
+ <state></state>
</option>
<option>
<name>CCPreprocFile</name>
@@ -1187,7 +1223,7 @@
<option>
<name>CCAllowList</name>
<version>1</version>
- <state>1111111</state>
+ <state>11111110</state>
</option>
<option>
<name>CCDebugInfo</name>
@@ -1372,6 +1408,15 @@
<name>CCNoLiteralPool</name>
<state>0</state>
</option>
+ <option>
+ <name>CCOptStrategySlave</name>
+ <version>0</version>
+ <state>0</state>
+ </option>
+ <option>
+ <name>CCGuardCalls</name>
+ <state>1</state>
+ </option>
</data>
</settings>
<settings>
@@ -1428,7 +1473,7 @@
</option>
<option>
<name>ADefines</name>
- <state>CORTEX_USE_FPU=TRUE</state>
+ <state></state>
</option>
<option>
<name>AList</name>
@@ -1551,7 +1596,7 @@
<debug>0</debug>
<option>
<name>OOCOutputFormat</name>
- <version>2</version>
+ <version>3</version>
<state>0</state>
</option>
<option>
@@ -1578,6 +1623,7 @@
<data>
<extensions></extensions>
<cmdline></cmdline>
+ <hasPrio>0</hasPrio>
</data>
</settings>
<settings>
@@ -2468,6 +2514,12 @@
<name>$PROJ_DIR$\..\..\..\..\test\rt\testsem.h</name>
</file>
<file>
+ <name>$PROJ_DIR$\..\..\..\..\test\rt\testsys.c</name>
+ </file>
+ <file>
+ <name>$PROJ_DIR$\..\..\..\..\test\rt\testsys.h</name>
+ </file>
+ <file>
<name>$PROJ_DIR$\..\..\..\..\test\rt\testthd.c</name>
</file>
<file>
diff --git a/demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvproj b/demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvprojx
index f54e35ab5..b9a6f4806 100644
--- a/demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvproj
+++ b/demos/STM32/RT-STM32F303-DISCOVERY/keil/ch.uvprojx
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_proj.xsd">
+<Project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_projx.xsd">
- <SchemaVersion>1.1</SchemaVersion>
+ <SchemaVersion>2.1</SchemaVersion>
<Header>### uVision Project, (C) Keil Software</Header>
@@ -14,6 +14,8 @@
<TargetCommonOption>
<Device>STM32F303VC</Device>
<Vendor>STMicroelectronics</Vendor>
+ <PackID>Keil.STM32F3xx_DFP.1.3.0</PackID>
+ <PackURL>http://www.keil.com/pack/</PackURL>
<Cpu>IROM(0x08000000,0x40000) IRAM(0x20000000,0xC000) IRAM2(0x10000000,0x2000) CPUTYPE("Cortex-M4") FPU2 CLOCK(72000000) ELITTLE</Cpu>
<FlashUtilSpec></FlashUtilSpec>
<StartupFile></StartupFile>
@@ -82,6 +84,8 @@
<UserProg2Name></UserProg2Name>
<UserProg1Dos16Mode>0</UserProg1Dos16Mode>
<UserProg2Dos16Mode>0</UserProg2Dos16Mode>
+ <nStopA1X>0</nStopA1X>
+ <nStopA2X>0</nStopA2X>
</AfterMake>
<SelectedForBatchBuild>0</SelectedForBatchBuild>
<SVCSIdString></SVCSIdString>
@@ -143,10 +147,9 @@
<RestoreToolbox>1</RestoreToolbox>
<RestoreTracepoints>1</RestoreTracepoints>
<RestoreSysVw>1</RestoreSysVw>
- <UsePdscDebugDescription>1</UsePdscDebugDescription>
</Target>
<RunDebugAfterBuild>0</RunDebugAfterBuild>
- <TargetSelection>13</TargetSelection>
+ <TargetSelection>11</TargetSelection>
<SimDlls>
<CpuDll></CpuDll>
<CpuDllArguments></CpuDllArguments>
@@ -360,8 +363,10 @@
<uSurpInc>0</uSurpInc>
<uC99>0</uC99>
<useXO>0</useXO>
+ <v6Lang>0</v6Lang>
+ <v6LangP>0</v6LangP>
<VariousControls>
- <MiscControls>--c99</MiscControls>
+ <MiscControls>--c99 -USTM32F303xC</MiscControls>
<Define>__heap_base__=Image$$$$RW_IRAM1$$$$ZI$$$$Limit __heap_end__=Image$$$$RW_IRAM2$$$$Base</Define>
<Undefine></Undefine>
<IncludePath>..\;..\..\..\..\os\common\ports\ARMCMx\devices\STM32F3xx;..\..\..\..\os\ext\CMSIS\include;..\..\..\..\os\ext\CMSIS\ST;..\..\..\..\os\rt\ports\ARMCMx;..\..\..\..\os\rt\ports\ARMCMx\compilers\RVCT;..\..\..\..\os\rt\include;..\..\..\..\os\hal\osal\rt;..\..\..\..\os\hal\include;..\..\..\..\os\hal\boards\ST_STM32F3_DISCOVERY;..\..\..\..\os\hal\ports\common\ARMCMx;..\..\..\..\os\hal\ports\STM32\STM32F3xx;..\..\..\..\os\hal\ports\STM32\LLD;..\..\..\..\os\hal\ports\STM32\LLD\GPIOv2;..\..\..\..\os\hal\ports\STM32\LLD\I2Cv2;..\..\..\..\os\hal\ports\STM32\LLD\RTCv2;..\..\..\..\os\hal\ports\STM32\LLD\SPIv2;..\..\..\..\os\hal\ports\STM32\LLD\TIMv1;..\..\..\..\os\hal\ports\STM32\LLD\USARTv2;..\..\..\..\os\hal\ports\STM32\LLD\USBv1;..\..\..\..\test\rt</IncludePath>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-22 15:05:49 +0000