Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit 2903ffe

Browse files
committed
Fixed RAM layout in scatterfile
It's alive!
1 parent 20ab299 commit 2903ffe

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Solutions/STM32F4DISCOVERY/TinyCLR/scatterfile_tinyclr_gcc.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -107,17 +107,11 @@
107107
<FileMapping Name="*" Options="(VectorTable)" />
108108
</ExecRegion>
109109

110-
<ExecRegion Name="ER_RAM_RW" Align="0x10" Options="&gt;IRAM AT&gt;LR_FLASH ">
110+
<ExecRegion Name="ER_RAM_RW" Align="0x10" Base="ADDR(ER_VECTORS) + SIZEOF(ER_VECTORS)" Options="&gt;IRAM AT&gt;LR_FLASH ">
111111
<FileMapping Name="*" Options="(rwdata)" />
112112
<FileMapping Name="*" Options="(.data*)" />
113113
</ExecRegion>
114114

115-
<ExecRegion Name="ER_RAM_RO" Align="0x10" Options="&gt;IRAM">
116-
<!-- Flash programming from Flash is safe on STM32 -->
117-
<!-- No need to place Flash programming code in RAM -->
118-
<!-- <FileMapping Name="*" Options="(SectionForFlashOperations)" /> -->
119-
</ExecRegion>
120-
121115
<ExecRegion Name=".bss" Align="0x10" Base="(NOLOAD)" Options="&gt;IRAM">
122116
<FileMapping Name="*" Options="(.bss*)" />
123117
<FileMapping Name="*" Options="(.zidata*)" />
@@ -126,9 +120,10 @@
126120
<FileMapping Name="*" Options="(COMMON)" />
127121
</ExecRegion>
128122

129-
<ExecRegion Name="/DISCARD/">
130-
<FileMapping Name="*" Options="(.ARM.exidx*)" />
131-
<FileMapping Name="*" Options="(.ARM.extab*)" />
123+
<ExecRegion Name="ER_RAM_RO" Align="0x10" Options="&gt;IRAM AT&gt;LR_FLASH">
124+
<!-- Flash programming from Flash is safe on STM32 -->
125+
<!-- No need to place Flash programming code in RAM -->
126+
<!-- <FileMapping Name="*" Options="(SectionForFlashOperations)" /> -->
132127
</ExecRegion>
133128

134129
<ExecRegion Name="ER_HEAP_BEGIN" Base="%Heap_BaseAddress%" Options="&gt;IRAM">
@@ -151,7 +146,12 @@
151146
<FileMapping Name="*" Options="(SectionForCustomHeapEnd)" />
152147
</ExecRegion>
153148

154-
<!-- ========= Internal CCM ============================================ -->
149+
<ExecRegion Name="/DISCARD/">
150+
<FileMapping Name="*" Options="(.ARM.exidx*)" />
151+
<FileMapping Name="*" Options="(.ARM.extab*)" />
152+
</ExecRegion>
153+
154+
<!-- ========= Internal CCM ============================================ -->
155155
<ExecRegion Name="ER_STACK_BOTTOM" Options="&gt;D_CCM">
156156
<FileMapping Name="*" Options="(SectionForStackBottom)" />
157157
</ExecRegion>

0 commit comments

Comments
 (0)