Merge pull request #595 from bcostm/master

Tools: NUCLEO_F411RE - Corrections in IAR icf and ewp.tmpl files
pull/596/merge
Martin Kojtal 2014-10-23 14:48:12 +01:00
commit 728a815b31
3 changed files with 45 additions and 44 deletions

View File

@ -0,0 +1,30 @@
/* [ROM = 512kb = 0x80000] */
define symbol __intvec_start__ = 0x08000000;
define symbol __region_ROM_start__ = 0x08000000;
define symbol __region_ROM_end__ = 0x0807FFFF;
/* [RAM = 128kb = 0x20000] Vector table dynamic copy: 102 vectors = 408 bytes (0x198) to be reserved in RAM */
define symbol __NVIC_start__ = 0x20000000;
define symbol __NVIC_end__ = 0x20000197; /* Aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000198;
define symbol __region_RAM_end__ = 0x2001FFFF;
/* Memory regions */
define memory mem with size = 4G;
define region ROM_region = mem:[from __region_ROM_start__ to __region_ROM_end__];
define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
/* Stack and Heap */
define symbol __size_cstack__ = 0x400;
define symbol __size_heap__ = 0x400;
define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK };
initialize by copy with packing = zeros { readwrite };
do not initialize { section .noinit };
place at address mem:__intvec_start__ { readonly section .intvec };
place in ROM_region { readonly };
place in RAM_region { readwrite, block STACKHEAP };

View File

@ -1,31 +0,0 @@
/*###ICF### Section handled by ICF editor, don't touch! ****/
/*-Editor annotation file-*/
/* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
/*-Specials-*/
define symbol __ICFEDIT_intvec_start__ = 0x08000000;
/*-Memory Regions-*/
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF;
define symbol __ICFEDIT_region_RAM_start__ = 0x20000000;
define symbol __ICFEDIT_region_RAM_end__ = 0x2001FFFF;
/*-Sizes-*/
define symbol __ICFEDIT_size_cstack__ = 0x400;
define symbol __ICFEDIT_size_heap__ = 0x200;
/**** End of ICF editor section. ###ICF###*/
define memory mem with size = 4G;
define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];
define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];
define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { };
define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { };
initialize by copy { readwrite };
do not initialize { section .noinit };
place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
place in ROM_region { readonly };
place in RAM_region { readwrite,
block CSTACK, block HEAP };

View File

@ -29,8 +29,8 @@
</option>
<option>
<name>Variant</name>
<version>20</version>
<state>40</state>
<version>21</version>
<state>38</state>
</option>
<option>
<name>GEndianMode</name>
@ -61,7 +61,7 @@
<option>
<name>FPU</name>
<version>2</version>
<state>5</state>
<state>0</state>
</option>
<option>
<name>OGCoreOrChip</name>
@ -87,7 +87,7 @@
</option>
<option>
<name>OGLastSavedByProductVersion</name>
<state>7.20.1.7306</state>
<state>7.30.1.7765</state>
</option>
<option>
<name>GeneralEnableMisra</name>
@ -137,17 +137,17 @@
</option>
<option>
<name>GFPUCoreSlave</name>
<version>20</version>
<state>40</state>
<version>21</version>
<state>38</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>20</version>
<state>40</state>
<version>21</version>
<state>38</state>
</option>
<option>
<name>OGUseCmsis</name>
<state>1</state>
<state>0</state>
</option>
<option>
<name>OGUseCmsisDspLib</name>
@ -172,7 +172,9 @@
</option>
<option>
<name>CCDefines</name>
<state></state>
{% for s in symbols %}
<state>{{s}}</state>
{% endfor %}
</option>
<option>
<name>CCPreprocFile</name>
@ -977,7 +979,7 @@
</option>
<option>
<name>Variant</name>
<version>20</version>
<version>21</version>
<state>0</state>
</option>
<option>
@ -1085,12 +1087,12 @@
</option>
<option>
<name>GFPUCoreSlave</name>
<version>20</version>
<version>21</version>
<state>0</state>
</option>
<option>
<name>GBECoreSlave</name>
<version>20</version>
<version>21</version>
<state>0</state>
</option>
<option>