Refactor and reorder ld script for cortex-m3.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4178 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/bertos/cpu/cortex-m3/scripts/cortex-m3_ram.ld b/bertos/cpu/cortex-m3/scripts/cortex-m3_ram.ld
new file mode 100644 (file)
index 0000000..df75798
--- /dev/null
+++ b/bertos/cpu/cortex-m3/scripts/cortex-m3_ram.ld
@@ -0,0 +1,109 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2008 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \author Manuele Fanelli <qwert@develer.com>
+ *
+ * \brief Script for Cortex M3 family processors.
+ *
+ */
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+
+/*
+ * Define stack size here
+ */
+STACK_SIZE = 0x1000;
+
+/*
+ * Allocate section memory
+ */
+SECTIONS
+{
+       .text :
+       {
+               KEEP(*(.vectors));
+               . = ALIGN (4);
+               KEEP(*(.init));
+               . = ALIGN (4);
+               *(.rodata .rodata.*);
+               . = ALIGN (4);
+               *(.text .text.*);
+               . = ALIGN (4);
+               *(.glue_7t);
+               . = ALIGN(4);
+               *(.glue_7);
+               . = ALIGN(4);
+       } > ram
+
+       __text_end = .;
+       PROVIDE (__text_end = .);
+
+       .data : AT (__text_end)
+       {
+               . = ALIGN (0x400);
+               PROVIDE (__data_start = .);
+               *(vtable)
+               *(.data .data.*)
+               . = ALIGN (4);
+               _edata = .;
+               PROVIDE (__data_end = .);
+       } > ram
+
+       .bss :
+       {
+               PROVIDE (__bss_start = .);
+               *(.bss .bss.*)
+               . = ALIGN(4);
+               *(COMMON)
+               . = ALIGN(4);
+               PROVIDE (__bss_end = .);
+       } > ram
+
+       /*
+        * Allocated stack at the end of bss section.
+        * Data heap is allocate at end of stack.
+        */
+       PROVIDE (__msp_start = .);
+       . = ALIGN(8);
+       . += STACK_SIZE;
+       PROVIDE (__msp_end = .);
+
+       PROVIDE (__psp_start = .);
+       . = ALIGN(8);
+       . += STACK_SIZE;
+       PROVIDE (__psp_end = .);
+
+       PROVIDE (__heap_start = .);
+       . = ALIGN(8);
+}
+

diff --git a/bertos/cpu/cortex-m3/scripts/cortex-m3_rom.ld b/bertos/cpu/cortex-m3/scripts/cortex-m3_rom.ld
new file mode 100644 (file)
index 0000000..c488d06
--- /dev/null
+++ b/bertos/cpu/cortex-m3/scripts/cortex-m3_rom.ld
@@ -0,0 +1,107 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2010 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief Script Cortex M3 family processors.
+ *
+ * \author Daniele Basile <asterix@develer.com>
+ */
+
+OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
+OUTPUT_ARCH(arm)
+
+/*
+ * Define stack size here
+ */
+STACK_SIZE = 0x1000;
+
+/*
+ * Allocate section memory
+ */
+SECTIONS
+{
+       .text :
+       {
+               KEEP(*(.vectors));
+               . = ALIGN (4);
+               KEEP(*(.init));
+               . = ALIGN (4);
+               *(.rodata .rodata.*);
+               . = ALIGN (4);
+               *(.text .text.*);
+               . = ALIGN (4);
+               *(.glue_7t);
+               . = ALIGN(4);
+               *(.glue_7);
+               . = ALIGN(4);
+       } > rom
+
+       __text_end = .;
+       PROVIDE (__text_end = .);
+
+       .data : AT (__text_end)
+       {
+               . = ALIGN (0x400);
+               PROVIDE (__data_start = .);
+               *(vtable)
+               *(.data .data.*)
+               . = ALIGN (4);
+               _edata = .;
+               PROVIDE (__data_end = .);
+       } > ram
+
+       .bss :
+       {
+               PROVIDE (__bss_start = .);
+               *(.bss .bss.*)
+               . = ALIGN(4);
+               *(COMMON)
+               . = ALIGN(4);
+               PROVIDE (__bss_end = .);
+       } > ram
+
+       /*
+        * Allocated stack at the end of bss section.
+        * Data heap is allocate at end of stack.
+        */
+       PROVIDE (__msp_start = .);
+       . = ALIGN(8);
+       . += STACK_SIZE;
+       PROVIDE (__msp_end = .);
+
+       PROVIDE (__psp_start = .);
+       . = ALIGN(8);
+       . += STACK_SIZE;
+       PROVIDE (__psp_end = .);
+
+       PROVIDE (__heap_start = .);
+       . = ALIGN(8);
+}

diff --git a/bertos/cpu/cortex-m3/scripts/lm3s1968_ram.ld b/bertos/cpu/cortex-m3/scripts/lm3s1968_ram.ld
index 2bd20d96aac15fa6e072f0e6e9bb7b9933c3690b..1afe56430a52b5df7cef02ff36b113295df49e2b 100644 (file)
--- a/bertos/cpu/cortex-m3/scripts/lm3s1968_ram.ld
+++ b/bertos/cpu/cortex-m3/scripts/lm3s1968_ram.ld
@@ -36,108 +36,14 @@
  *
  */
 
-
-SEARCH_DIR(.)
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-
 /*
  * Define memory configuration for LM3S1968 board
  */
 MEMORY
 {
-  rom(rx) : org = 0x00000000, len = 256k
-  ram(rwx) : org = 0x20000000, len = 64k
+        rom(rx) : org = 0x00000000, len = 256k
+        ram(rwx) : org = 0x20000000, len = 64k
 }
 
-
-/*
- * Define stack size here
- */
-FIQ_STACK_SIZE = 0x0100;
-IRQ_STACK_SIZE = 0x0100;
-ABT_STACK_SIZE = 0x0100;
-UND_STACK_SIZE = 0x0100;
-SVC_STACK_SIZE = 0x0400;
-
-/*
- * Allocate section memory
- */
-SECTIONS
-{
-       .text :
-       {
-               KEEP(*(.vectors));
-               . = ALIGN (4);
-               KEEP(*(.init));
-               . = ALIGN (4);
-               *(.rodata .rodata.*);
-               . = ALIGN (4);
-               *(.text .text.*);
-               . = ALIGN (4);
-               *(.glue_7t);
-               . = ALIGN(4);
-               *(.glue_7);
-               . = ALIGN(4);
-       } > ram
-
-       _etext = .;
-       PROVIDE (__etext = .);
-
-       .data : AT (_etext)
-       {
-               PROVIDE (__data_start = .);
-               *(vtable)
-               . = ALIGN (0x400);
-               *(.data .data.*)
-               . = ALIGN (4);
-               _edata = .;
-               PROVIDE (__data_end = .);
-       } > ram
-
-       .bss :
-       {
-               PROVIDE (__bss_start = .);
-               *(.bss .bss.*)
-               . = ALIGN(4);
-               *(COMMON)
-               . = ALIGN(4);
-               PROVIDE (__bss_end = .);
-       } > ram
-
-       /*
-        * Allocated stack at the end of bss section.
-        * Data heap is allocate at end of stack.
-        */
-       PROVIDE (__stack_start = .);
-
-       PROVIDE (__stack_fiq_start = .);
-       . += FIQ_STACK_SIZE;
-       . = ALIGN(4);
-       PROVIDE (__stack_fiq_end = .);
-
-       PROVIDE (__stack_irq_start = .);
-       . += IRQ_STACK_SIZE;
-       . = ALIGN(4);
-       PROVIDE (__stack_irq_end = .);
-
-       PROVIDE (__stack_abt_start = .);
-       . += ABT_STACK_SIZE;
-       . = ALIGN(4);
-       PROVIDE (__stack_abt_end = .);
-
-       PROVIDE (__stack_und_start = .);
-       . += UND_STACK_SIZE;
-       . = ALIGN(4);
-       PROVIDE (__stack_und_end = .);
-
-       PROVIDE (__stack_svc_start = .);
-       . += SVC_STACK_SIZE;
-       . = ALIGN(4);
-       PROVIDE (__stack_svc_end = .);
-
-       PROVIDE (__stack_end = .);
-
-       PROVIDE (__heap_start = .);
-}
+INCLUDE "bertos/cpu/cortex-m3/scripts/cortex-m3_ram.ld"
 

diff --git a/bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld b/bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld
index b4ed93a330209ab29bb413053dce250769c619cd..8a8cefe25f31c3cb38cd044688b339e6ae5e379c 100644 (file)
--- a/bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld
+++ b/bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld
@@ -36,83 +36,14 @@
  *
  */
 
-SEARCH_DIR(.)
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-
 /*
  * Define memory configuration for LM3S1968 board
  */
 MEMORY
 {
-  rom(rx) : org = 0x00000000, len = 256k
-  ram(rwx) : org = 0x20000000, len = 64k
+       rom(rx) : org = 0x00000000, len = 256k
+       ram(rwx) : org = 0x20000000, len = 64k
 }
 
-/*
- * Define stack size here
- */
-STACK_SIZE = 0x1000;
-
-/*
- * Allocate section memory
- */
-SECTIONS
-{
-       .text :
-       {
-               KEEP(*(.vectors));
-               . = ALIGN (4);
-               KEEP(*(.init));
-               . = ALIGN (4);
-               *(.rodata .rodata.*);
-               . = ALIGN (4);
-               *(.text .text.*);
-               . = ALIGN (4);
-               *(.glue_7t);
-               . = ALIGN(4);
-               *(.glue_7);
-               . = ALIGN(4);
-       } > rom
+INCLUDE "bertos/cpu/cortex-m3/scripts/cortex-m3_rom.ld"
 
-       __text_end = .;
-       PROVIDE (__text_end = .);
-
-       .data : AT (__text_end)
-       {
-               . = ALIGN (0x400);
-               PROVIDE (__data_start = .);
-               *(vtable)
-               *(.data .data.*)
-               . = ALIGN (4);
-               _edata = .;
-               PROVIDE (__data_end = .);
-       } > ram
-
-       .bss :
-       {
-               PROVIDE (__bss_start = .);
-               *(.bss .bss.*)
-               . = ALIGN(4);
-               *(COMMON)
-               . = ALIGN(4);
-               PROVIDE (__bss_end = .);
-       } > ram
-
-       /*
-        * Allocated stack at the end of bss section.
-        * Data heap is allocate at end of stack.
-        */
-       PROVIDE (__msp_start = .);
-       . = ALIGN(8);
-       . += STACK_SIZE;
-       PROVIDE (__msp_end = .);
-
-       PROVIDE (__psp_start = .);
-       . = ALIGN(8);
-       . += STACK_SIZE;
-       PROVIDE (__psp_end = .);
-
-       PROVIDE (__heap_start = .);
-       . = ALIGN(8);
-}

diff --git a/bertos/cpu/cortex-m3/scripts/lm3s8962_ram.ld b/bertos/cpu/cortex-m3/scripts/lm3s8962_ram.ld
index 87d9a30978bfdebd2f0fecb075cc4002efd90b0a..54bef074e728ece21c43759ec0bacf08acafe889 100644 (file)
--- a/bertos/cpu/cortex-m3/scripts/lm3s8962_ram.ld
+++ b/bertos/cpu/cortex-m3/scripts/lm3s8962_ram.ld
@@ -35,4 +35,14 @@
  * \author Andrea Righi <arighi@develer.com>
  */
 
-INCLUDE bertos/cpu/cortex-m3/scripts/lm3s1968_ram.ld
+/*
+ * Define memory configuration for LM3S1968 board
+ */
+MEMORY
+{
+        rom(rx) : org = 0x00000000, len = 256k
+        ram(rwx) : org = 0x20000000, len = 64k
+}
+
+INCLUDE "bertos/cpu/cortex-m3/scripts/cortex-m3_rom.ld"
+

diff --git a/bertos/cpu/cortex-m3/scripts/lm3s8962_rom.ld b/bertos/cpu/cortex-m3/scripts/lm3s8962_rom.ld
index 03a497f73f4bef9ee03e24d31bb6fcfa66116a82..93ef1b1ade8f24250acb7daebdbac09b398ee86b 100644 (file)
--- a/bertos/cpu/cortex-m3/scripts/lm3s8962_rom.ld
+++ b/bertos/cpu/cortex-m3/scripts/lm3s8962_rom.ld
@@ -35,4 +35,13 @@
  * \author Andrea Righi <arighi@develer.com>
  */
 
-INCLUDE bertos/cpu/cortex-m3/scripts/lm3s1968_rom.ld
+/*/
+ * Define memory configuration for LM3S8962 board
+ */
+MEMORY
+{
+       rom(rx) : org = 0x00000000, len = 256k
+       ram(rwx) : org = 0x20000000, len = 64k
+}
+
+INCLUDE "bertos/cpu/cortex-m3/scripts/cortex-m3_rom.ld"

diff --git a/bertos/cpu/cortex-m3/scripts/stm32f103rb_rom.ld b/bertos/cpu/cortex-m3/scripts/stm32f103rb_rom.ld
index 334d81182253a74ab234a9a3174b0387b6c9bea8..438bb615080a95dd954536d79d004f88ca0c507a 100644 (file)
--- a/bertos/cpu/cortex-m3/scripts/stm32f103rb_rom.ld
+++ b/bertos/cpu/cortex-m3/scripts/stm32f103rb_rom.ld
@@ -36,10 +36,6 @@
  *
  */
 
-SEARCH_DIR(.)
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-
 /*
  * Define memory configuration for STM32F103R8
  */
@@ -49,70 +45,5 @@ MEMORY
        ram(rwx) : org = 0x20000000, len = 20k
 }
 
-/*
- * Define stack size here
- */
-STACK_SIZE = 0x1000;
-
-/*
- * Allocate section memory
- */
-SECTIONS
-{
-       .text :
-       {
-               KEEP(*(.vectors));
-               . = ALIGN (4);
-               KEEP(*(.init));
-               . = ALIGN (4);
-               *(.rodata .rodata.*);
-               . = ALIGN (4);
-               *(.text .text.*);
-               . = ALIGN (4);
-               *(.glue_7t);
-               . = ALIGN(4);
-               *(.glue_7);
-               . = ALIGN(4);
-       } > rom
+INCLUDE "bertos/cpu/cortex-m3/scripts/cortex-m3_rom.ld"
 
-       __text_end = .;
-       PROVIDE (__text_end = .);
-
-       .data : AT (__text_end)
-       {
-               PROVIDE (__data_start = .);
-               . = ALIGN (0x400);
-               *(vtable)
-               *(.data .data.*)
-               . = ALIGN (4);
-               _edata = .;
-               PROVIDE (__data_end = .);
-       } > ram
-
-       .bss :
-       {
-               PROVIDE (__bss_start = .);
-               *(.bss .bss.*)
-               . = ALIGN(4);
-               *(COMMON)
-               . = ALIGN(4);
-               PROVIDE (__bss_end = .);
-       } > ram
-
-       /*
-        * Allocated stack at the end of bss section.
-        * Data heap is allocate at end of stack.
-        */
-       PROVIDE (__msp_start = .);
-       . = ALIGN(8);
-       . += STACK_SIZE;
-       PROVIDE (__msp_end = .);
-
-       PROVIDE (__psp_start = .);
-       . = ALIGN(8);
-       . += STACK_SIZE;
-       PROVIDE (__psp_end = .);
-
-       PROVIDE (__heap_start = .);
-       . = ALIGN(8);
-}