Skip to content

Commit 8c84532

Browse files
doingnzdoingnz
committed
Merge pull request NETMF#1 from doingnz/ARM_DS5
Merge in support for Arm DS5 toolset.
2 parents c2affe0 + 7cbf6a3 commit 8c84532

File tree

16 files changed

+1586
-9
lines changed

16 files changed

+1586
-9
lines changed

‎DeviceCode/Targets/Native/STM32/STM32.settings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
<PropertyGroup>
2020
<OEMSystemInfoString>Copyright Oberon microsystems, Inc.</OEMSystemInfoString>
2121
</PropertyGroup>
22-
22+
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='DS5'">
23+
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M3</DEVICE_TYPE>
24+
<BUILD_TOOL_GUID>{F7823E3C-8BCE-4D9A-AD56-9E06063C47CD}</BUILD_TOOL_GUID>
25+
</PropertyGroup>
2326
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='RVDS'">
2427
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M3</DEVICE_TYPE>
2528
<BUILD_TOOL_GUID>{1942C531-3AAC-4abb-8B4F-C3111012F9D9}</BUILD_TOOL_GUID>

‎DeviceCode/Targets/Native/STM32F4/STM32F2.settings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
<ItemGroup>
2323
<CC_CPP_Defines Include="__CORTEX_M3" />
2424
</ItemGroup>
25-
25+
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='DS5'">
26+
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M3</DEVICE_TYPE>
27+
<BUILD_TOOL_GUID>{F7823E3C-8BCE-4D9A-AD56-9E06063C47CD}</BUILD_TOOL_GUID>
28+
</PropertyGroup>
2629
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='RVDS'">
2730
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M3</DEVICE_TYPE>
2831
<BUILD_TOOL_GUID>{1942C531-3AAC-4abb-8B4F-C3111012F9D9}</BUILD_TOOL_GUID>

‎DeviceCode/Targets/Native/STM32F4/STM32F4.settings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
<CC_CPP_Defines Include="__CORTEX_M4F" />
2121
<CC_CPP_Defines Include="CORTEX_M4" />
2222
</ItemGroup>
23-
23+
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='DS5'">
24+
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M3</DEVICE_TYPE>
25+
<BUILD_TOOL_GUID>{F7823E3C-8BCE-4D9A-AD56-9E06063C47CD}</BUILD_TOOL_GUID>
26+
</PropertyGroup>
2427
<PropertyGroup Condition="'$(COMPILER_TOOL)'=='RVDS'">
2528
<DEVICE_TYPE Condition="'$(DEVICE_TYPE)' == ''">Cortex-M4.fp</DEVICE_TYPE>
2629
<BUILD_TOOL_GUID>{00C50096-00DD-00E7-BBA9-7FC84D408562}</BUILD_TOOL_GUID>

‎Framework/Tools/BuildTasks/ScatterFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,7 @@ internal object Parse( System.Xml.XmlNode node )
573573
string name = node.Name;
574574
IParse o = null;
575575

576-
if (GetVariable("COMPILER_TOOL").ToUpper() == "RVDS" || GetVariable("COMPILER_TOOL").ToUpper() == "MDK")
576+
if (GetVariable("COMPILER_TOOL").ToUpper() == "RVDS" || GetVariable("COMPILER_TOOL").ToUpper() == "MDK" || GetVariable("COMPILER_TOOL").ToUpper() == "DS5")
577577
{
578578
if (name == "ScatterFile") o = new Group();
579579
else if (name == "Set") o = new Variable();

‎Solutions/MCBSTM32F400/MicroBooter/scatterfile_microbooter_ds5.xml

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?xml version="1.0"?>
2+
<ScatterFile xmlns="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd">
3+
4+
<!-- Freescale MC9328L, NO SRAM, SDRAM 32M/64M -->
5+
6+
<Set Name="Valid" Value="false"/>
7+
8+
<!-- ################################################################################ -->
9+
10+
<Set Name="Heap_Begin" Value="0x08100000"/>
11+
<Set Name="Heap_End" Value="0x084FFFF8"/>
12+
<Set Name="Stack_Bottom" Value="+0"/>
13+
<Set Name="Stack_Top" Value="0x08502000"/>
14+
15+
16+
<If Name="TARGETLOCATION" In="FLASH">
17+
18+
<!-- iMXS has 8MB of 32-bit FLASH at 0x10000000 -->
19+
<Set Name="Code_BaseAddress" Value="0x10000000"/>
20+
<Set Name="Code_Size" Value="0x00020000"/>
21+
<Set Name="RAM_RO_Base" Value="0x00000000"/>
22+
<Set Name="Valid" Value="true"/>
23+
24+
</If>
25+
26+
<If Name="TARGETLOCATION" In="RAM">
27+
28+
<Set Name="Code_BaseAddress" Value="0x08200000"/>
29+
<Set Name="Code_Size" Value="0x00030000"/>
30+
<Set Name="RAM_RO_Base" Value="+0"/>
31+
<Set Name="Valid" Value="true"/>
32+
33+
</If>
34+
35+
36+
<!-- ################################################################################ -->
37+
38+
<If Name="Valid" Value="false">
39+
<Error Message="Configuration not recognized"/>
40+
</If>
41+
42+
<!-- we start at 0x10080000 since PortBooter lives at 0x10000000 -->
43+
<!-- the address and sizes for both load regions (LR_*) are chosen to start and completely fill a flash partition in the 28F320W18 flash chip -->
44+
45+
<LoadRegion Name="LR_%TARGETLOCATION%" Base="%Code_BaseAddress%" Options="ABSOLUTE" Size="%Code_Size%">
46+
47+
<!-- we have arbitrarily asigned 0x00080000 offset in FLASH for the CLR code, and size of 0x00080000 -->
48+
49+
<ExecRegion Name="ER_%TARGETLOCATION%" Base="%Code_BaseAddress%" Options="FIXED" Size="">
50+
51+
<FileMapping Name="FirstEntry.obj" Options="(+RO, +FIRST)" /> <!-- the entry pointer section goes into this region -->
52+
53+
<FileMapping Name="*" Options="(SectionForBootstrapOperations)" />
54+
<FileMapping Name="*" Options="(+RO)" />
55+
56+
</ExecRegion>
57+
58+
<!-- skip vector area -->
59+
60+
<ExecRegion Name="ER_RAM_RO" Base="%RAM_RO_Base%" Options="ABSOLUTE" Size="">
61+
62+
<FileMapping Name="VectorsTrampolines.obj" Options="(+RO, +FIRST)" /> <!-- for vector handlers to be far from the vectors -->
63+
64+
<FileMapping Name="*" Options="(i.IDelayLoop)" Comment="00004a98 24 16 IDelayLoop" />
65+
<FileMapping Name="*" Options="(i._Z23Time_Sleep_MicroSecondsj)" Comment="_Z23Time_Sleep_MicroSecondsj" />
66+
<FileMapping Name="*" Options="(i._Z40Time_Sleep_MicroSeconds_InterruptEnabledj)" Comment="_Z40Time_Sleep_MicroSeconds_InterruptEnabledj" />
67+
<FileMapping Name="*" Options="(i._Z23CPU_MicrosecondsToTicksj)" Comment="_Z23CPU_MicrosecondsToTicksj" />
68+
<FileMapping Name="*" Options="(i._Z17Events_MaskedReadj)" Comment="000070ec 20 20787 Events_MaskedRead__FUi" />
69+
<FileMapping Name="*" Options="(i._ZN16MC9328MXL_Driver5PauseEv)" />
70+
<FileMapping Name="*" Options="(i._ZN21MC9328MXL_TIME_Driver12CounterValueEv)" Comment="00007840 40 712150 _ZN21MC9328MXL_TIME_Driver12CounterValueEv" />
71+
<FileMapping Name="*" Options="(i._ZN21MC9328MXL_AITC_Driver17ActivateInterruptEjjPFvPvES0_h)" Comment="00007604 76 231095 _ZN21MC9328MXL_AITC_Driver17ActivateInterruptEjjPFvPvES0_h" />
72+
<FileMapping Name="*" Options="(i._ZN21MC9328MXL_AITC_Driver19DeactivateInterruptEj)" Comment="00007604 76 231095 _ZN21MC9328MXL_AITC_Driver19DeactivateInterruptEj" />
73+
<FileMapping Name="*" Options="(i._ZN21MC9328MXL_TIME_Driver15SetCompareValueEy)" Comment="00007868 96 181492 _ZN21MC9328MXL_TIME_Driver15SetCompareValueEy" />
74+
<FileMapping Name="*" Options="(i._ZN21MC9328MXL_TIME_Driver11CurrentTimeEv)" Comment="000079d0 88 94500 _ZN21MC9328MXL_TIME_Driver11CurrentTimeEv" />
75+
<FileMapping Name="*" Options="(i._ZN25MC9328MXL_WATCHDOG_Driver12ResetCounterEv)" Comment="00007adc 24 22218 _ZN25MC9328MXL_WATCHDOG_Driver12ResetCounterEv" />
76+
<FileMapping Name="*" Options="(i._Z18SUPPORT_ComputeCRCPKvij)" Comment="00006654 72 1709347 SUPPORT_ComputeCRC__FPCviUi" />
77+
<FileMapping Name="rt_sdiv.o" Options="(+RO)" />
78+
<FileMapping Name="rt_memclr.o" Options="(+RO)" />
79+
<FileMapping Name="rt_memclr_w.o" Options="(+RO)" />
80+
<FileMapping Name="rt_memcpy.o" Options="(+RO)" />
81+
<FileMapping Name="rt_memcpy_w.o" Options="(+RO)" />
82+
<FileMapping Name="llshl.o" Options="(+RO)" />
83+
<FileMapping Name="llsdiv.o" Options="(+RO)" />
84+
<FileMapping Name="llushr.o" Options="(+RO)" />
85+
<FileMapping Name="lludiv.o" Options="(+RO)" />
86+
87+
<FileMapping Name="*" Options="(SectionForFlashOperations)" />
88+
89+
</ExecRegion>
90+
91+
<ExecRegion Name="ER_RAM_RW" Base="+0" Options="ABSOLUTE" Size="">
92+
93+
<FileMapping Name="*" Options="(+RW-DATA, +ZI)" />
94+
95+
</ExecRegion>
96+
97+
<ExecRegion Name="ER_HEAP_BEGIN" Base="%Heap_Begin%" Options="ABSOLUTE" Size="UNINIT">
98+
<FileMapping Name="*" Options="(SectionForHeapBegin)" />
99+
</ExecRegion>
100+
101+
<!-- everything between heapbegin and heapend will be allocated for a heap -->
102+
103+
<ExecRegion Name="ER_HEAP_END" Base="%Heap_End%" Options="ABSOLUTE" Size="UNINIT">
104+
<FileMapping Name="*" Options="(SectionForHeapEnd)" />
105+
</ExecRegion>
106+
107+
108+
<ExecRegion Name="ER_STACK_BOTTOM" Base="%Stack_Bottom%" Options="ABSOLUTE" Size="UNINIT">
109+
<FileMapping Name="*" Options="(SectionForStackBottom)" />
110+
</ExecRegion>
111+
112+
<ExecRegion Name="ER_STACK_TOP" Base="%Stack_Top%" Options="ABSOLUTE" Size="UNINIT">
113+
<FileMapping Name="*" Options="(SectionForStackTop)" />
114+
</ExecRegion>
115+
116+
</LoadRegion>
117+
118+
</ScatterFile>

‎Solutions/MCBSTM32F400/TinyBooter/scatterfile_bootloader_ds5.xml

Lines changed: 158 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
1+
<?xml version="1.0"?>
2+
<ScatterFile xmlns="http://schemas.microsoft.com/netmf/ScatterfileSchema.xsd">
3+
4+
<!-- STM32F4 with 1M Flash, 128k SRAM, and 64k DATA CCM -->
5+
6+
<Set Name="Valid" Value="false"/>
7+
8+
<!-- ################################################################################ -->
9+
10+
<!-- Memory Region base and size values for physical hardware to help clarify the mapping
11+
by making Symbolic names available instead of a bunch of numbers. These values are
12+
fixed in hardware and therefore, don't change.
13+
-->
14+
<!-- Internal FLASH -->
15+
<Set Name="IFLASH_BaseAddress" Value="0x08000000"/>
16+
<Set Name="IFLASH_Size" Value="0x00100000"/><!-- 1MB -->
17+
18+
<!-- Core Coupled Memory (CCM) [D-Bus] -->
19+
<Set Name="CCM_BaseAddress" Value="0x10000000"/>
20+
<Set Name="CCM_Size" Value="0x00010000"/><!-- 64KB -->
21+
22+
<!-- Internal SRAM -->
23+
<Set Name="IRAM_BaseAddress" Value="0x20000000"/>
24+
<Set Name="IRAM_Size" Value="0x00020000"/><!-- 128KB -->
25+
26+
<!-- External NOR Flash-->
27+
<Set Name="NOR_BaseAddress" Value="0x60000000"/>
28+
<Set Name="NOR_Size" Value="0x00800000"/><!-- 8MB -->
29+
30+
<!-- External SRAM -->
31+
<Set Name="EXTRAM_BaseAddress" Value="0x68000000"/>
32+
<Set Name="EXTRAM_Size" Value="0x00200000"/><!-- 2MB -->
33+
34+
<!-- Solution specific usage settings -->
35+
<!-- Internal CCM (D-Bus) -->
36+
<!-- Put Stack in CCM for high speed access, reducing overhead of stack usage -->
37+
<Set Name="Stack_Bottom" Value="%CCM_BaseAddress%"/>
38+
39+
<!-- External SRAM -->
40+
<Set Name="Heap_BaseAddress" Value="%EXTRAM_BaseAddress%"/>
41+
42+
<!-- External NOR FLASH -->
43+
<!-- Configuration section is at base of external NOR flash
44+
This needs to be in the same block storage device as the
45+
deployment region to enable the MFDeploy to access it.
46+
( Due to device side library implementation limit )
47+
-->
48+
<Set Name="Config_BaseAddress" Value="%NOR_BaseAddress%"/>
49+
<Set Name="Config_Size" Value="0x00010000"/><!-- 64KB -->
50+
51+
<!-- DAT region goes into external NOR Flash -->
52+
<Set Name="Data_BaseAddress" Value="%Config_BaseAddress% + %Config_Size%"/>
53+
<Set Name="Data_Size" Value="0x00020000"/><!-- 128KB -->
54+
<!-- Deployment fills the rest of external NOR flash... -->
55+
56+
<!-- Internal FLASH -->
57+
<!-- TinyBooter sits at power on Reset vector-->
58+
<Set Name="BooterCode_BaseAddress" Value="%IFLASH_BaseAddress%"/>
59+
<Set Name="BooterCode_Size" Value="0x00010000"/><!-- 64KB -->
60+
61+
<If Name="TARGETLOCATION" Value="FLASH">
62+
<!-- Internal FLASH -->
63+
64+
<!-- Native Code section -->
65+
<Set Name="Code_BaseAddress" Value="%BooterCode_BaseAddress%"/>
66+
<Set Name="Code_Size" Value="%BooterCode_Size%"/>
67+
68+
<!-- =========================================================== -->
69+
<If Name="TARGETTYPE" Value="Release">
70+
<!-- ALL of external RAM is enabled for the CLR HEAP -->
71+
<Set Name="Heap_Size" Value="0x00080000"/><!-- 512K -->
72+
<Set Name="CustomHeap_Size" Value="0x00080000"/><!-- 512K -->
73+
74+
<Set Name="Valid" Value="true"/>
75+
</If>
76+
<If Name="TARGETTYPE" Value="Debug">
77+
<!-- Use only 1MB of external RAM for Debug builds.
78+
Can't use all of external RAM as the address pins overlap
79+
with the SWD pins used for ETM tracing in Debug builds.
80+
-->
81+
<Set Name="Heap_Size" Value="0x00100000"/><!--1MB-->
82+
<Set Name="CustomHeap_Size" Value="0x00100000"/><!--1MB-->
83+
84+
<Set Name="Valid" Value="true"/>
85+
</If>
86+
</If>
87+
88+
<!-- ################################################################################ -->
89+
90+
<If Name="Valid" Value="false">
91+
<Error Message="Configuration not recognized"/>
92+
</If>
93+
94+
<LoadRegion Name="LR_%TARGETLOCATION%" Base="%Code_BaseAddress%" Options="ABSOLUTE" Size="%Code_Size%">
95+
96+
<!-- ========= INTERNAL FLASH ============================================ -->
97+
<ExecRegion Name="ER_%TARGETLOCATION%" Base="%Code_BaseAddress%" Options="FIXED" Size="">
98+
<FileMapping Name="*" Options="(SectionForPowerOnReset, +FIRST)" />
99+
<FileMapping Name="*" Options="(SectionForBootstrapOperations)" />
100+
<FileMapping Name="*" Options="(+RO-CODE)" />
101+
<FileMapping Name="*" Options="(+RO-DATA)" />
102+
</ExecRegion>
103+
104+
<!-- ========= INTERNAL RAM ============================================= -->
105+
<!-- Writeable Vector table -->
106+
<!-- NOTE:
107+
Despite what you might hope for, this CANNOT go into the CCM area as the NVIC does not
108+
have access to that space (it sees the AHB layer and below, rather than the core's D-Bus)
109+
-->
110+
<!-- Alignment for the vector table is important to allow the NVIC to decode the proper locations
111+
(See Section 4.4.4 of the ARM Cortex-M4 Generic User Guide [ ARM DUI 0553A (ID121610) ] )
112+
Since this starts the SRAM block, it's aligned just fine for any size table.
113+
-->
114+
<ExecRegion Name="ER_RAM_RW" Base="%IRAM_BaseAddress%" Options="ABSOLUTE" Size="">
115+
<FileMapping Name="*" Options="(VectorTable)"/>
116+
<FileMapping Name="*" Options="(+RW-DATA, +ZI)" />
117+
</ExecRegion>
118+
119+
<ExecRegion Name="ER_RAM_RO" Base="+0" Options="ABSOLUTE" Size="">
120+
<!-- Flash programming from Flash is safe on STM32 -->
121+
<!-- No need to place Flash programming code in RAM -->
122+
<!-- <FileMapping Name="*" Options="(SectionForFlashOperations)" /> -->
123+
</ExecRegion>
124+
125+
<!-- ========= EXTERNAL RAM ============================================= -->
126+
<ExecRegion Name="ER_HEAP_BEGIN" Base="%Heap_BaseAddress%" Options="ABSOLUTE UNINIT" Size="">
127+
<FileMapping Name="*" Options="(SectionForHeapBegin)" />
128+
</ExecRegion>
129+
130+
<!-- everything between heapbegin and heapend will be allocated for a heap -->
131+
132+
<ExecRegion Name="ER_HEAP_END" Base="+%Heap_Size%" Options="ABSOLUTE UNINIT" Size="">
133+
<FileMapping Name="*" Options="(SectionForHeapEnd)" />
134+
</ExecRegion>
135+
136+
<ExecRegion Name="ER_CUSTOM_HEAP_BEGIN" Base="+0" Options="ABSOLUTE UNINIT" Size="">
137+
<FileMapping Name="*" Options="(SectionForCustomHeapBegin)" />
138+
</ExecRegion>
139+
140+
<!-- everything between heapbegin and heapend will be allocated for the unmanaged SimpleHeap -->
141+
142+
<ExecRegion Name="ER_CUSTOM_HEAP_END" Base="+%CustomHeap_Size%" Options="ABSOLUTE UNINIT" Size="">
143+
<FileMapping Name="*" Options="(SectionForCustomHeapEnd)" />
144+
</ExecRegion>
145+
146+
<!-- ========= Internal CCM ============================================ -->
147+
<ExecRegion Name="ER_STACK_BOTTOM" Base="%Stack_Bottom%" Options="ABSOLUTE UNINIT" Size="">
148+
<FileMapping Name="*" Options="(SectionForStackBottom)" />
149+
</ExecRegion>
150+
151+
<!-- -8 for the two 32bit values in the SectionForStack* sections, This keeps the region
152+
limit from exceeding the size of physical memory.
153+
-->
154+
<ExecRegion Name="ER_STACK_TOP" Base="AlignExpr(+%CCM_Size% -8, 8 )" Options="ABSOLUTE UNINIT" Size="">
155+
<FileMapping Name="*" Options="(SectionForStackTop +LAST)" />
156+
</ExecRegion>
157+
</LoadRegion>
158+
</ScatterFile>

0 commit comments

Comments
 (0)