diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-22 08:18:21 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-26 18:21:10 +0200 |
commit | cde9fcb8cb8c6a9c2b13436d1a1ae4891bf89bf5 (patch) | |
tree | 5113ce09bc800b876616a481c2535a198e86b57c /arch/arm/pbl | |
parent | dc7d63b3cc0a50c810e8214bf8a4f59c2b132f04 (diff) | |
download | barebox-cde9fcb8cb8c6a9c2b13436d1a1ae4891bf89bf5.tar.gz barebox-cde9fcb8cb8c6a9c2b13436d1a1ae4891bf89bf5.tar.xz |
ARM: pbl: move linker script to lib
Since the pbl linker script can be reused by the upcoming multi image
build process move it to a common place. Also remove ENTRY() from the
linker script and instead add the -e option to the linker. This makes
the entrypoint configurable.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/pbl')
-rw-r--r-- | arch/arm/pbl/Makefile | 5 | ||||
-rw-r--r-- | arch/arm/pbl/zbarebox.lds.S | 92 |
2 files changed, 4 insertions, 93 deletions
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile index 3f50f77bc0..8923a704e1 100644 --- a/arch/arm/pbl/Makefile +++ b/arch/arm/pbl/Makefile @@ -29,9 +29,12 @@ endif zbarebox-common := $(barebox-pbl-common) $(obj)/$(piggy_o) zbarebox-lds := $(obj)/zbarebox.lds +$(zbarebox-lds): $(obj)/../lib/pbl.lds.S FORCE + $(call if_changed_dep,cpp_lds_S) + quiet_cmd_zbarebox__ ?= LD $@ cmd_zbarebox__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_zbarebox) -o $@ \ - -T $(zbarebox-lds) \ + -e pbl_start -T $(zbarebox-lds) \ --start-group $(zbarebox-common) --end-group \ $(filter-out $(zbarebox-lds) $(zbarebox-common) FORCE ,$^) diff --git a/arch/arm/pbl/zbarebox.lds.S b/arch/arm/pbl/zbarebox.lds.S deleted file mode 100644 index 6b23bbe79c..0000000000 --- a/arch/arm/pbl/zbarebox.lds.S +++ /dev/null @@ -1,92 +0,0 @@ -/* - * (C) Copyright 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program 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., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - * - */ -#include <sizes.h> -#include <asm-generic/barebox.lds.h> -#include <asm-generic/memory_layout.h> - -OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") -OUTPUT_ARCH(arm) -ENTRY(pbl_start) -SECTIONS -{ -#ifdef CONFIG_PBL_RELOCATABLE - . = 0x0; -#else - . = TEXT_BASE - SZ_2M; -#endif - - PRE_IMAGE - - . = ALIGN(4); - .text : - { - _stext = .; - _text = .; - *(.text_head_entry*) - __bare_init_start = .; - *(.text_bare_init*) - __bare_init_end = .; - *(.text*) - } - - /* Discard unwind if enable in barebox */ - /DISCARD/ : { *(.ARM.ex*) } - - BAREBOX_BARE_INIT_SIZE - - . = ALIGN(4); - .rodata : { *(.rodata*) } - - _etext = .; /* End of text and rodata section */ - - . = ALIGN(4); - .data : { *(.data*) } - - .rel.dyn : { - __rel_dyn_start = .; - *(.rel*) - __rel_dyn_end = .; - } - - .dynsym : { - __dynsym_start = .; - *(.dynsym) - __dynsym_end = .; - } - - . = ALIGN(4); - __bss_start = .; - .bss : { *(.bss*) } - __bss_stop = .; - _end = .; - - . = ALIGN(4); - __piggydata_start = .; - .piggydata : { - *(.piggydata) - } - __piggydata_end = .; - - _barebox_image_size = __piggydata_end - (TEXT_BASE - SZ_2M); - _barebox_pbl_size = __bss_start - (TEXT_BASE - SZ_2M); -} |