Revision 58:0954ebd79f59, committed 2013-01-21

Comitter:

emilmont

Date:

Mon Jan 21 11:55:43 2013 +0000

Parent:

57:0480438fc29c

Child:

59:0883845fe643

Commit message:

[IAR] Position Stack and Heap in the same ordered block, reserve memory area for NVIC.

Changed in this revision

--- a/LPC1768/IAR/LPC17xx.icf	Fri Jan 18 10:30:14 2013 +0000
+++ b/LPC1768/IAR/LPC17xx.icf	Mon Jan 21 11:55:43 2013 +0000
@@ -1,44 +1,40 @@
-/*###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__ = 0x00000000;
-/*-Memory Regions-*/
-define symbol __ICFEDIT_region_ROM_start__   = 0x00000000;
-define symbol __ICFEDIT_region_ROM_end__     = 0x0007FFFF;
-define symbol __ICFEDIT_region_RAM_start__   = 0x10000000;
-define symbol __ICFEDIT_region_RAM_end__     = 0x1000FFDF;
-/*-Sizes-*/
-define symbol __ICFEDIT_size_cstack__   = 0x400;
-define symbol __ICFEDIT_size_heap__     = 0x200;
-/**** End of ICF editor section. ###ICF###*/
+/* [ROM] */
+define symbol __intvec_start__     = 0x00000000;
+define symbol __region_ROM_start__ = 0x00000000;
+define symbol __CRP_start__        = 0x000002FC;
+define symbol __CRP_end__          = 0x000002FF;
+define symbol __region_ROM_end__   = 0x0007FFFF;
 
-define symbol __CRP_start__   = 0x000002FC;
-define symbol __CRP_end__     = 0x000002FF;
-
-/* Memory used by ISP, and 32 bytes from top of RAM*/
-define symbol __ISP_start__   = 0x10000118;
-define symbol __ISP_end__     = 0x100001FF;
+/* [RAM] Vector table dynamic copy: 8_byte_aligned(49 vect * 4 bytes) =  8_byte_aligned(0xC4) = 0xC8*/
+define symbol __NVIC_start__       = 0x10000000;
+define symbol __NVIC_end__         = 0x100000C7;
+define symbol __region_RAM_start__ = 0x100000C8;
+define symbol __region_RAM_end__   = 0x1000FFDF;
+define symbol _AHB_RAM_start__     = 0x2007C000;
+define symbol _AHB_RAM_end__       = 0x20083FFF;
 
+/* Memory regions */
 define memory mem with size = 4G;
-define region ROM_region   = mem:[from __ICFEDIT_region_ROM_start__   to __ICFEDIT_region_ROM_end__] - mem:[from  __CRP_start__ to __CRP_end__];
-define region RAM_region   = mem:[from __ICFEDIT_region_RAM_start__   to __ICFEDIT_region_RAM_end__] - mem:[from  __ISP_start__ to __ISP_end__];
-define region CRP_region   = mem:[from  __CRP_start__ to __CRP_end__];
 
-define symbol _AHB_RAM_start__  = 0x2007C000;
-define symbol _AHB_RAM_end__    = 0x20083FFF;
+define region ROM_region     = mem:[from __region_ROM_start__   to __region_ROM_end__] - mem:[from  __CRP_start__ to __CRP_end__];
+define region CRP_region     = mem:[from  __CRP_start__ to __CRP_end__];
+
+define region RAM_region     = mem:[from __region_RAM_start__   to __region_RAM_end__];
 define region AHB_RAM_region = mem:[from _AHB_RAM_start__ to _AHB_RAM_end__];
 
-define block CSTACK    with alignment = 8, size = __ICFEDIT_size_cstack__   { };
-define block HEAP      with alignment = 8, size = __ICFEDIT_size_heap__     { };
+/* Stack and Heap */
+define symbol __size_cstack__   = 0x800;
+define symbol __size_heap__     = 0x800;
+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:__ICFEDIT_intvec_start__ { section .intvec };
+place at address mem:__intvec_start__ { section .intvec };
 place at address mem:0x2FC { section CRPKEY };
 place in ROM_region     { readonly };
-place in RAM_region     { readwrite,
-                          block CSTACK, block HEAP };
+place in RAM_region     { readwrite, block STACKHEAP };
 place in AHB_RAM_region { section USB_RAM };
-place in CRP_region  		{ section .crp };
+place in CRP_region     { section .crp };