aboutsummaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorgdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-01-15 10:14:20 +0000
committergdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>2011-01-15 10:14:20 +0000
commit6e11b18986d202f8a2e44cead0c37a2145360337 (patch)
tree049911c9b2aba94fc8ac4ed0d98185ecdc2a32aa /demos
parent7474bb1c105be4221812eb272e2a8764ae74bee7 (diff)
downloadChibiOS-6e11b18986d202f8a2e44cead0c37a2145360337.tar.gz
ChibiOS-6e11b18986d202f8a2e44cead0c37a2145360337.tar.bz2
ChibiOS-6e11b18986d202f8a2e44cead0c37a2145360337.zip
Fixed bug 3158776.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@2643 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'demos')
-rw-r--r--demos/ARMCM0-LPC1114-LPCXPRESSO/iar/ch.icf20
-rw-r--r--demos/ARMCM3-LPC1343-LPCXPRESSO/iar/ch.icf20
-rw-r--r--demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.icf20
-rw-r--r--demos/ARMCM3-STM32F103/iar/ch.icf20
4 files changed, 44 insertions, 36 deletions
diff --git a/demos/ARMCM0-LPC1114-LPCXPRESSO/iar/ch.icf b/demos/ARMCM0-LPC1114-LPCXPRESSO/iar/ch.icf
index 4caa34574..a31967680 100644
--- a/demos/ARMCM0-LPC1114-LPCXPRESSO/iar/ch.icf
+++ b/demos/ARMCM0-LPC1114-LPCXPRESSO/iar/ch.icf
@@ -20,18 +20,20 @@ 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 IRQSTACK with alignment = 8, size = __ICFEDIT_size_irqstack__ { };
-define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { };
-define block SYSHEAP with alignment = 8, size = 0 { };
+define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ {section CSTACK};
+define block IRQSTACK with alignment = 8, size = __ICFEDIT_size_irqstack__ {};
+define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ {};
+define block SYSHEAP with alignment = 8 {section SYSHEAP};
+define block DATABSS with alignment = 8 {readwrite, zeroinit};
initialize by copy { readwrite };
do not initialize { section .noinit };
keep { section .intvec };
-place at address mem:__ICFEDIT_intvec_start__ { section .intvec };
-place in ROM_region { readonly };
-place in RAM_region { block IRQSTACK, block CSTACK, readwrite, block HEAP, block SYSHEAP};
-
-define exported symbol __heap_end__ = end(RAM_region) + 1;
+place at address mem:__ICFEDIT_intvec_start__ {section .intvec};
+place in ROM_region {readonly};
+place at start of RAM_region {block IRQSTACK};
+place in RAM_region {block DATABSS, block HEAP};
+place in RAM_region {block SYSHEAP};
+place at end of RAM_region {block CSTACK};
diff --git a/demos/ARMCM3-LPC1343-LPCXPRESSO/iar/ch.icf b/demos/ARMCM3-LPC1343-LPCXPRESSO/iar/ch.icf
index 4caa34574..a31967680 100644
--- a/demos/ARMCM3-LPC1343-LPCXPRESSO/iar/ch.icf
+++ b/demos/ARMCM3-LPC1343-LPCXPRESSO/iar/ch.icf
@@ -20,18 +20,20 @@ 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 IRQSTACK with alignment = 8, size = __ICFEDIT_size_irqstack__ { };
-define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { };
-define block SYSHEAP with alignment = 8, size = 0 { };
+define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ {section CSTACK};
+define block IRQSTACK with alignment = 8, size = __ICFEDIT_size_irqstack__ {};
+define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ {};
+define block SYSHEAP with alignment = 8 {section SYSHEAP};
+define block DATABSS with alignment = 8 {readwrite, zeroinit};
initialize by copy { readwrite };
do not initialize { section .noinit };
keep { section .intvec };
-place at address mem:__ICFEDIT_intvec_start__ { section .intvec };
-place in ROM_region { readonly };
-place in RAM_region { block IRQSTACK, block CSTACK, readwrite, block HEAP, block SYSHEAP};
-
-define exported symbol __heap_end__ = end(RAM_region) + 1;
+place at address mem:__ICFEDIT_intvec_start__ {section .intvec};
+place in ROM_region {readonly};
+place at start of RAM_region {block IRQSTACK};
+place in RAM_region {block DATABSS, block HEAP};
+place in RAM_region {block SYSHEAP};
+place at end of RAM_region {block CSTACK};
diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.icf b/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.icf
index f33d49367..fe1ac2c14 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.icf
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.icf
@@ -20,18 +20,20 @@ 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 IRQSTACK with alignment = 8, size = __ICFEDIT_size_irqstack__ { };
-define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { };
-define block SYSHEAP with alignment = 8, size = 0 { };
+define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ {section CSTACK};
+define block IRQSTACK with alignment = 8, size = __ICFEDIT_size_irqstack__ {};
+define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ {};
+define block SYSHEAP with alignment = 8 {section SYSHEAP};
+define block DATABSS with alignment = 8 {readwrite, zeroinit};
initialize by copy { readwrite };
do not initialize { section .noinit };
keep { section .intvec };
-place at address mem:__ICFEDIT_intvec_start__ { section .intvec };
-place in ROM_region { readonly };
-place in RAM_region { block IRQSTACK, block CSTACK, readwrite, block HEAP, block SYSHEAP};
-
-define exported symbol __heap_end__ = end(RAM_region) + 1;
+place at address mem:__ICFEDIT_intvec_start__ {section .intvec};
+place in ROM_region {readonly};
+place at start of RAM_region {block IRQSTACK};
+place in RAM_region {block DATABSS, block HEAP};
+place in RAM_region {block SYSHEAP};
+place at end of RAM_region {block CSTACK};
diff --git a/demos/ARMCM3-STM32F103/iar/ch.icf b/demos/ARMCM3-STM32F103/iar/ch.icf
index 0aedf5910..67ef6e73a 100644
--- a/demos/ARMCM3-STM32F103/iar/ch.icf
+++ b/demos/ARMCM3-STM32F103/iar/ch.icf
@@ -20,18 +20,20 @@ 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 IRQSTACK with alignment = 8, size = __ICFEDIT_size_irqstack__ { };
-define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ { };
-define block SYSHEAP with alignment = 8, size = 0 { };
+define block CSTACK with alignment = 8, size = __ICFEDIT_size_cstack__ {section CSTACK};
+define block IRQSTACK with alignment = 8, size = __ICFEDIT_size_irqstack__ {};
+define block HEAP with alignment = 8, size = __ICFEDIT_size_heap__ {};
+define block SYSHEAP with alignment = 8 {section SYSHEAP};
+define block DATABSS with alignment = 8 {readwrite, zeroinit};
initialize by copy { readwrite };
do not initialize { section .noinit };
keep { section .intvec };
-place at address mem:__ICFEDIT_intvec_start__ { section .intvec };
-place in ROM_region { readonly };
-place in RAM_region { block IRQSTACK, block CSTACK, readwrite, block HEAP, block SYSHEAP};
-
-define exported symbol __heap_end__ = end(RAM_region) + 1;
+place at address mem:__ICFEDIT_intvec_start__ {section .intvec};
+place in ROM_region {readonly};
+place at start of RAM_region {block IRQSTACK};
+place in RAM_region {block DATABSS, block HEAP};
+place in RAM_region {block SYSHEAP};
+place at end of RAM_region {block CSTACK};