git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@3197 35acf78f-673a-0410-8e92-d51de3d6d3f4

3 files changed, 8 insertions, 152 deletions

diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/Makefile b/demos/ARMCM3-STM32F100-DISCOVERY/Makefile
index 4baf3dc0a..71aa3ffec 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY/Makefile
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/Makefile
@@ -52,10 +52,7 @@ endif
 # Define project name here

 PROJECT = ch

 

-# Define linker script file here

-LDSCRIPT= ch.ld

-

-# Imported source files

+# Imported source files and paths

 CHIBIOS = ../..

 include $(CHIBIOS)/boards/ST_STM32VL_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

@@ -64,6 +61,9 @@ include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 

+# Define linker script file here

+LDSCRIPT= $(PORTLD)/STM32F100xB.ld

+

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CSRC = $(PORTSRC) \

diff --git a/demos/ARMCM3-STM32F103/Makefile b/demos/ARMCM3-STM32F103/Makefile
index 884838604..45101dc87 100644
--- a/demos/ARMCM3-STM32F103/Makefile
+++ b/demos/ARMCM3-STM32F103/Makefile
@@ -52,10 +52,7 @@ endif
 # Define project name here

 PROJECT = ch

 

-# Define linker script file here

-LDSCRIPT= ch.ld

-

-# Imported source files

+# Imported source files and paths

 CHIBIOS = ../..

 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk

 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk

@@ -64,6 +61,9 @@ include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk

 include $(CHIBIOS)/test/test.mk

 

+# Define linker script file here

+LDSCRIPT= $(PORTLD)/STM32F103xB.ld

+

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

 CSRC = $(PORTSRC) \

diff --git a/demos/ARMCM3-STM32F103/ch.ld b/demos/ARMCM3-STM32F103/ch.ld
deleted file mode 100644
index f929c0832..000000000
--- a/demos/ARMCM3-STM32F103/ch.ld
+++ /dev/null
@@ -1,144 +0,0 @@
-/*

-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,

-                 2011 Giovanni Di Sirio.

-

-    This file is part of ChibiOS/RT.

-

-    ChibiOS/RT 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 3 of the License, or

-    (at your option) any later version.

-

-    ChibiOS/RT 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, see <http://www.gnu.org/licenses/>.

-*/

-

-/*

- * ST32F103 memory setup.

- */

-__main_stack_size__     = 0x0400;

-__process_stack_size__  = 0x0400;

-

-MEMORY

-{

-    flash : org = 0x08000000, len = 128k

-    ram : org = 0x20000000, len = 20k

-}

-

-__ram_start__           = ORIGIN(ram);

-__ram_size__            = LENGTH(ram);

-__ram_end__             = __ram_start__ + __ram_size__;

-

-SECTIONS

-{

-    . = 0;

-    _text = .;

-

-    startup : ALIGN(16) SUBALIGN(16)

-    {

-        KEEP(*(vectors))

-    } > flash

-

-    constructors : ALIGN(4) SUBALIGN(4)

-    {

-        PROVIDE(__init_array_start = .);

-        KEEP(*(SORT(.init_array.*)))

-        KEEP(*(.init_array))

-        PROVIDE(__init_array_end = .);

-    } > flash

-

-    destructors : ALIGN(4) SUBALIGN(4)

-    {

-        PROVIDE(__fini_array_start = .);

-        KEEP(*(.fini_array))

-        KEEP(*(SORT(.fini_array.*)))

-        PROVIDE(__fini_array_end = .);

-    } > flash

-

-    .text : ALIGN(16) SUBALIGN(16)

-    {

-        *(.text.startup.*)

-        *(.text)

-        *(.text.*)

-        *(.rodata)

-        *(.rodata.*)

-        *(.glue_7t)

-        *(.glue_7)

-        *(.gcc*)

-    } > flash

-

-    .ARM.extab :

-    {

-        *(.ARM.extab* .gnu.linkonce.armextab.*)

-    } > flash

-

-    .ARM.exidx : {

-        PROVIDE(__exidx_start = .);

-        *(.ARM.exidx* .gnu.linkonce.armexidx.*)

-        PROVIDE(__exidx_end = .);

-     } > flash

-

-    .eh_frame_hdr :

-    {

-        *(.eh_frame_hdr)

-    } > flash

-

-    .eh_frame : ONLY_IF_RO

-    {

-        *(.eh_frame)

-    } > flash

-

-    . = ALIGN(4);

-    _etext = .;

-    _textdata = _etext;

-

-    .stacks :

-    {

-        . = ALIGN(8);

-        __main_stack_base__ = .;

-        . += __main_stack_size__;

-        . = ALIGN(8);

-        __main_stack_end__ = .;

-        __process_stack_base__ = .;

-        __main_thread_stack_base__ = .;

-        . += __process_stack_size__;

-        . = ALIGN(8);

-        __process_stack_end__ = .;

-        __main_thread_stack_end__ = .;

-    } > ram

-

-    .data :

-    {

-        PROVIDE(_data = .);

-        *(.data)

-        . = ALIGN(4);

-        *(.data.*)

-        . = ALIGN(4);

-        *(.ramtext)

-        . = ALIGN(4);

-        PROVIDE(_edata = .);

-    } > ram AT > flash

-

-    .bss :

-    {

-        PROVIDE(_bss_start = .);

-        *(.bss)

-        . = ALIGN(4);

-        *(.bss.*)

-        . = ALIGN(4);

-        *(COMMON)

-        . = ALIGN(4);

-        PROVIDE(_bss_end = .);

-    } > ram    

-}

-

-PROVIDE(end = .);

-_end            = .;

-

-__heap_base__   = _end;

-__heap_end__    = __ram_end__;