Fixed linker files (Ram size on one) and for the rest increased the heap and stack size

pull/777/head
GustavWi 2014-12-09 18:37:01 +01:00
parent bd6836396b
commit 490dd0ddfe
12 changed files with 45 additions and 43 deletions

View File

@ -11,8 +11,8 @@ define symbol __ICFEDIT_region_NVIC_end__ = 0x200000EB;
define symbol __ICFEDIT_region_RAM_start__ = 0x200000EC; define symbol __ICFEDIT_region_RAM_start__ = 0x200000EC;
define symbol __ICFEDIT_region_RAM_end__ = 0x20004FFF; define symbol __ICFEDIT_region_RAM_end__ = 0x20004FFF;
/*-Sizes-*/ /*-Sizes-*/
define symbol __ICFEDIT_size_cstack__ = 0x800; define symbol __ICFEDIT_size_cstack__ = 0x1000;
define symbol __ICFEDIT_size_heap__ = 0x800; define symbol __ICFEDIT_size_heap__ = 0x1700;
/**** End of ICF editor section. ###ICF###*/ /**** End of ICF editor section. ###ICF###*/
define memory mem with size = 4G; define memory mem with size = 4G;

View File

@ -15,8 +15,8 @@ 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__]; define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x800;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x800;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };

View File

@ -15,8 +15,8 @@ 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__]; define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x800;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x800;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };

View File

@ -15,8 +15,8 @@ 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__]; define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x1000;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x2000;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };

View File

@ -15,8 +15,8 @@ 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__]; define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x1000;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x1700;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };

View File

@ -19,8 +19,8 @@ define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_
define region CCMRAM_region = mem:[from __region_CCMRAM_start__ to __region_CCMRAM_end__]; define region CCMRAM_region = mem:[from __region_CCMRAM_start__ to __region_CCMRAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x2000;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x2000;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };

View File

@ -7,7 +7,7 @@ define symbol __region_ROM_end__ = 0x0800FFFF;
define symbol __NVIC_start__ = 0x20000000; define symbol __NVIC_start__ = 0x20000000;
define symbol __NVIC_end__ = 0x20000187; /*aligned on 8 bytes */ define symbol __NVIC_end__ = 0x20000187; /*aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000188; define symbol __region_RAM_start__ = 0x20000188;
define symbol __region_RAM_end__ = 0x20003FFF; define symbol __region_RAM_end__ = 0x20002FFF;
define symbol __region_CCMRAM_start__ = 0x10000000; define symbol __region_CCMRAM_start__ = 0x10000000;
define symbol __region_CCMRAM_end__ = 0x10000FFF; define symbol __region_CCMRAM_end__ = 0x10000FFF;
@ -18,8 +18,8 @@ define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__]
define region CCMRAM_region = mem:[from __region_CCMRAM_start__ to __region_CCMRAM_end__]; define region CCMRAM_region = mem:[from __region_CCMRAM_start__ to __region_CCMRAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x800;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x1000;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };

View File

@ -14,8 +14,8 @@ define symbol __ICFEDIT_region_RAM_end__ = 0x2001FFFF;
define symbol __ICFEDIT_region_CCMRAM_start__ = 0x10000000; define symbol __ICFEDIT_region_CCMRAM_start__ = 0x10000000;
define symbol __ICFEDIT_region_CCMRAM_end__ = 0x1000FFFF; define symbol __ICFEDIT_region_CCMRAM_end__ = 0x1000FFFF;
/*-Sizes-*/ /*-Sizes-*/
define symbol __ICFEDIT_size_cstack__ = 0x400; define symbol __ICFEDIT_size_cstack__ = 0x2000;
define symbol __ICFEDIT_size_heap__ = 0x8000; define symbol __ICFEDIT_size_heap__ = 0x2000;
/**** End of ICF editor section. ###ICF###*/ /**** End of ICF editor section. ###ICF###*/

View File

@ -1,30 +1,32 @@
/* [ROM] */ /*###ICF### Section handled by ICF editor, don't touch! ****/
define symbol __intvec_start__ = 0x08000000; /*-Editor annotation file-*/
define symbol __region_ROM_start__ = 0x08000000; /* IcfEditorFile="$TOOLKIT_DIR$\config\ide\IcfEditor\cortex_v1_0.xml" */
define symbol __region_ROM_end__ = 0x0807FFFF; /*-Specials-*/
define symbol __ICFEDIT_intvec_start__ = 0x08000000;
/* [RAM] Vector table dynamic copy: 101 vectors * 4 bytes = 404 bytes (0x194) */ /*-Memory Regions-*/
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_end__ = 0x0807FFFF;
define symbol __NVIC_start__ = 0x20000000; define symbol __NVIC_start__ = 0x20000000;
define symbol __NVIC_end__ = 0x20000197; /* to be aligned on 8 bytes */ define symbol __NVIC_end__ = 0x20000197; /* to be aligned on 8 bytes */
define symbol __region_RAM_start__ = 0x20000198; define symbol __ICFEDIT_region_RAM_start__ = 0x20000198;
define symbol __region_RAM_end__ = 0x20017E67; /* 0x17FFF - 0x198 */ define symbol __ICFEDIT_region_RAM_end__ = 0x20017FFF;
/*-Sizes-*/
define symbol __ICFEDIT_size_cstack__ = 0x2000;
define symbol __ICFEDIT_size_heap__ = 0x2000;
/**** End of ICF editor section. ###ICF###*/
/* Memory regions */
define memory mem with size = 4G; define memory mem with size = 4G;
define region ROM_region = mem:[from __region_ROM_start__ to __region_ROM_end__]; define region ROM_region = mem:[from __ICFEDIT_region_ROM_start__ to __ICFEDIT_region_ROM_end__];
define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__]; define region RAM_region = mem:[from __ICFEDIT_region_RAM_start__ to __ICFEDIT_region_RAM_end__];
/* Stack and Heap */ define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ { };
define symbol __size_cstack__ = 0x400; define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { };
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 }; initialize by copy { readwrite };
do not initialize { section .noinit }; do not initialize { section .noinit };
place at address mem:__intvec_start__ { readonly section .intvec }; place at address mem:__ICFEDIT_intvec_start__ { readonly section .intvec };
place in ROM_region { readonly }; place in ROM_region { readonly };
place in RAM_region { readwrite, block STACKHEAP }; place in RAM_region { readwrite,
block HEAP, block CSTACK };

View File

@ -15,8 +15,8 @@ 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__]; define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x4000;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x4000;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };

View File

@ -15,8 +15,8 @@ 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__]; define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x500;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x1000;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };

View File

@ -15,8 +15,8 @@ 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__]; define region RAM_region = mem:[from __region_RAM_start__ to __region_RAM_end__];
/* Stack and Heap */ /* Stack and Heap */
define symbol __size_cstack__ = 0x400; define symbol __size_cstack__ = 0x1000;
define symbol __size_heap__ = 0x400; define symbol __size_heap__ = 0x1000;
define block CSTACK with alignment = 8, size = __size_cstack__ { }; define block CSTACK with alignment = 8, size = __size_cstack__ { };
define block HEAP with alignment = 8, size = __size_heap__ { }; define block HEAP with alignment = 8, size = __size_heap__ { };
define block STACKHEAP with fixed order { block HEAP, block CSTACK }; define block STACKHEAP with fixed order { block HEAP, block CSTACK };