Improved scatter files.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8280 35acf78f-673a-0410-8e92-d51de3d6d3f4
2015-09-04 12:57:06 +00:00 · 2015-09-04 12:57:06 +00:00 · 4c19d32590
parent c497eb864e
commit 4c19d32590
32 changed files with 101 additions and 5 deletions
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x4.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x4.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x6.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x6.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x8.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F030x8.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F051x8.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F072xB.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F072xB.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F100xB.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F100xB.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xB.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xB.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xD.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xD.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xE.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xE.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xE_maplemini_bootloader.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xE_maplemini_bootloader.ld
@ -50,4 +50,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xG.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F103xG.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F107xC.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F107xC.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F302x8.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F302x8.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F303xC.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F303xC.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F334x8.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F334x8.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F373xC.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F373xC.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F401xC.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F401xC.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F401xE.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F401xE.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F405xG.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F405xG.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F407xG.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F407xG.ld
@ -48,4 +48,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F411xC.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F411xC.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F411xE.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F411xE.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F429xI.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F429xI.ld
@ -48,4 +48,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L052x6.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L052x6.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L052x8.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L052x8.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L053x8.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L053x8.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L151x6.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L151x6.ld
@ -39,4 +39,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L152xB.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L152xB.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L152xE.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L152xE.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L476xG.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/ld/STM32L476xG.ld
@ -47,4 +47,7 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);

+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
 INCLUDE rules.ld
--- a/os/common/ports/ARMCMx/compilers/GCC/rules.ld
+++ b/os/common/ports/ARMCMx/compilers/GCC/rules.ld
@ -224,9 +224,13 @@ SECTIONS
        . = ALIGN(4);
        __ram7_free__ = .;
    } > ram7
-}

-/* Heap default boundaries, it is defaulted to be the non-used part
-   of ram0 region.*/
-__heap_base__   = __ram0_free__;
-__heap_end__    = __ram0_end__;
+    /* The default heap uses the (statically) unused part of a RAM section.*/
+    .heap (NOLOAD) :
+    {
+        . = ALIGN(8);
+        __heap_base__ = .;
+        . = ORIGIN(HEAP_RAM) + LENGTH(HEAP_RAM);
+        __heap_end__ = .;
+    } > HEAP_RAM
+}
--- a/readme.txt
+++ b/readme.txt
@ -73,6 +73,8 @@
 *****************************************************************************

 *** 3.1.0 ***
+- VAR: Improved GCC rules.ld, now it is possible to assign the heap to any
+       of the available RAM regions.
 - HAL: STM32 GPT, ICU and PWM driver enhancements. Now it is possible to
       suppress default ISRs by defining STM32_TIMx_SUPPRESS_ISR.
       The application is now able to define custom handlers if required