diff --git a/lib/lpc43xx/libopencm3_lpc43xx.ld b/lib/lpc43xx/libopencm3_lpc43xx.ld index 8da52737..8f0220f0 100644 --- a/lib/lpc43xx/libopencm3_lpc43xx.ld +++ b/lib/lpc43xx/libopencm3_lpc43xx.ld @@ -4,6 +4,7 @@ * Copyright (C) 2009 Uwe Hermann * Copyright (C) 2012 Michael Ossmann * Copyright (C) 2012 Benjamin Vernoux + * Copyright (C) 2012 Jared Boone * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -83,13 +84,14 @@ SECTIONS _etext_ram = 0; /* Start of Code in RAM NULL because Copy of Code from ROM to RAM disabled */ _etext_rom = 0; /* Start of Code in RAM NULL because Copy of Code from ROM to RAM disabled */ + . = ORIGIN(ram_local2); + .data : { _data = .; *(.data*) /* Read-write initialized data */ . = ALIGN(4); _edata = .; - } >ram AT >rom - _data_loadaddr = LOADADDR(.data); + } >ram_local2 AT >rom .bss : { _bss = .; @@ -97,8 +99,16 @@ SECTIONS *(COMMON) . = ALIGN(4); _ebss = .; - } >ram + } >ram_local2 +<<<<<<< HEAD +======= + /* exception unwind data - required due to libgcc.a issuing /0 exceptions */ + .ARM.extab : { + *(.ARM.extab*) + } >ram_local2 + +>>>>>>> bba3412... Changed ldscripts to use new RAM region names, placed .data/.bss/stack into separate local RAM region. /* * The .eh_frame section appears to be used for C++ exception handling. * You may need to fix this if you're using C++. @@ -109,6 +119,6 @@ SECTIONS end = .; /* Leave room above stack for IAP to run. */ - __StackTop = ORIGIN(ram) + LENGTH(ram) - 32; + __StackTop = ORIGIN(ram_local2) + LENGTH(ram_local2) - 32; PROVIDE(_stack = __StackTop); } diff --git a/lib/lpc43xx/libopencm3_lpc43xx_ram_only.ld b/lib/lpc43xx/libopencm3_lpc43xx_ram_only.ld new file mode 100644 index 00000000..8e7b9ac8 --- /dev/null +++ b/lib/lpc43xx/libopencm3_lpc43xx_ram_only.ld @@ -0,0 +1,100 @@ +/* + * This file is part of the libopencm3 project. + * + * Copyright (C) 2009 Uwe Hermann + * Copyright (C) 2012 Michael Ossmann + * Copyright (C) 2012 Benjamin Vernoux + * Copyright (C) 2012 Jared Boone + * + * This library is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This library 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 Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this library. If not, see . + */ + +/* Generic linker script for LPC43XX targets using libopencm3. */ + +/* Memory regions must be defined in the ld script which includes this one. */ + +/* Enforce emmition of the vector table. */ +EXTERN (vector_table) + +/* Define the entry point of the output file. */ +ENTRY(reset_handler) + +/* Define sections. */ +SECTIONS +{ + . = ORIGIN(ram_local1); + + .text : { + . = ALIGN(0x400); + _text_ram = 0; /* Start of Code in RAM NULL because Copy of Code from ROM to RAM disabled */ + *(.vectors) /* Vector table */ + *(.text*) /* Program code */ + . = ALIGN(4); + *(.rodata*) /* Read-only data */ + . = ALIGN(4); + } >ram_local1 + + /* exception index - required due to libgcc.a issuing /0 exceptions */ + __exidx_start = .; + .ARM.exidx : { + *(.ARM.exidx*) + } > ram_local1 + __exidx_end = .; + + _etext = .; + _etext_ram = 0; /* Start of Code in RAM NULL because Copy of Code from ROM to RAM disabled */ + _etext_rom = 0; /* Start of Code in RAM NULL because Copy of Code from ROM to RAM disabled */ + + . = ORIGIN(ram_local2); + + .data : { + *(.data*) /* Read-write initialized data */ + . = ALIGN(4); + } >ram_local2 + + /* Running from RAM only, loading the .elf will initialize data for us. */ + _data = .; + _edata = .; + + .bss : { + _bss = .; + *(.bss*) /* Read-write zero initialized data */ + *(COMMON) + . = ALIGN(4); + _ebss = .; + } >ram_local2 + + /* exception unwind data - required due to libgcc.a issuing /0 exceptions */ + .ARM.extab : { + *(.ARM.extab*) + } >ram_local2 + + /* + * The .eh_frame section appears to be used for C++ exception handling. + * You may need to fix this if you're using C++. + */ + /DISCARD/ : { *(.eh_frame) } + + /* + * Another section used by C++ stuff, appears when using newlib with + * 64bit (long long) printf support - discard it for now. + */ + /DISCARD/ : { *(.ARM.exidx) } + + end = .; + + /* Leave room above stack for IAP to run. */ + __StackTop = ORIGIN(ram_local2) + LENGTH(ram_local2) - 32; + PROVIDE(_stack = __StackTop); +} diff --git a/lib/lpc43xx/libopencm3_lpc43xx_rom_to_ram.ld b/lib/lpc43xx/libopencm3_lpc43xx_rom_to_ram.ld index 17879fe8..34e19201 100644 --- a/lib/lpc43xx/libopencm3_lpc43xx_rom_to_ram.ld +++ b/lib/lpc43xx/libopencm3_lpc43xx_rom_to_ram.ld @@ -4,6 +4,7 @@ * Copyright (C) 2009 Uwe Hermann * Copyright (C) 2012 Michael Ossmann * Copyright (C) 2012 Benjamin Vernoux + * Copyright (C) 2012 Jared Boone * * This library is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by @@ -34,7 +35,7 @@ SECTIONS { .text : { . = ALIGN(0x400); - _text_ram = (. - ORIGIN(rom)) + ORIGIN(ram); /* Start of Code in RAM */ + _text_ram = (. - ORIGIN(rom)) + ORIGIN(ram_local1); /* Start of Code in RAM */ *(.vectors) /* Vector table */ *(.text*) /* Program code */ @@ -81,7 +82,7 @@ SECTIONS . = ALIGN(4); _etext = .; - _etext_ram = (. - ORIGIN(rom)) + ORIGIN(ram); + _etext_ram = (. - ORIGIN(rom)) + ORIGIN(ram_local1); _etext_rom = (. - ORIGIN(rom)) + ORIGIN(rom_flash); .data : { @@ -89,8 +90,7 @@ SECTIONS *(.data*) /* Read-write initialized data */ . = ALIGN(4); _edata = .; - } >ram_data AT >rom - _data_loadaddr = LOADADDR(.data); + } >ram_local2 AT >rom .bss : { . = _edata; @@ -99,7 +99,13 @@ SECTIONS *(COMMON) . = ALIGN(4); _ebss = .; - } >ram_data + } >ram_local2 + + /* exception unwind data - required due to libgcc.a issuing /0 exceptions */ + .ARM.extab : { + . = _ebss; + *(.ARM.extab*) + } >ram_local2 /* * The .eh_frame section appears to be used for C++ exception handling. @@ -111,6 +117,6 @@ SECTIONS end = .; /* Leave room above stack for IAP to run. */ - __StackTop = ORIGIN(ram) + LENGTH(ram) - 32; + __StackTop = ORIGIN(ram_local2) + LENGTH(ram_local2) - 32; PROVIDE(_stack = __StackTop); }