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 | |
| 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')
| -rw-r--r-- | arch/arm/lib/pbl.lds.S (renamed from arch/arm/pbl/zbarebox.lds.S) | 1 | ||||
| -rw-r--r-- | arch/arm/pbl/Makefile | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/pbl/zbarebox.lds.S b/arch/arm/lib/pbl.lds.S index 6b23bbe79c..d3ec2f86a1 100644 --- a/arch/arm/pbl/zbarebox.lds.S +++ b/arch/arm/lib/pbl.lds.S @@ -26,7 +26,6 @@ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_ARCH(arm) -ENTRY(pbl_start) SECTIONS { #ifdef CONFIG_PBL_RELOCATABLE 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 ,$^) |