summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorChristian Eggers <ceggers@arri.de>2020-01-27 14:30:43 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2020-02-10 09:42:43 +0100
commit07c4c069475fec43bd99e021afb3839d7b27fd5a (patch)
tree79c485537d7d537bbc567dce75fef9dc26081779 /images
parent9fcd7fcd5c6028a77b6339c48a0d90f7f2dd3955 (diff)
downloadbarebox-07c4c069475fec43bd99e021afb3839d7b27fd5a.tar.gz
barebox-07c4c069475fec43bd99e021afb3839d7b27fd5a.tar.xz
images: Use separate LDFLAGS for PBL
When setting CONFIG_PBL_RELOCATABLE=y (selected by PBL_MULTI_IMAGES) and CONFIG_RELOCATABLE=n (trying to reduce image size), the PBL is also linked with "-static" instead of "-pie". The result is a non-working PBL. As a side effect, also get rid of erroneous "-Map barebox.map" when linking the PBL. Only changed for ARM, are any other platforms affected? Signed-off-by: Christian Eggers <ceggers@arri.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'images')
-rw-r--r--images/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/images/Makefile b/images/Makefile
index 34b7a56101..650baf170f 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -54,7 +54,7 @@ $(pbl-lds): $(obj)/../arch/$(ARCH)/lib/pbl.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)
quiet_cmd_elf__ ?= LD $@
- cmd_elf__ ?= $(LD) $(LDFLAGS_barebox) --gc-sections \
+ cmd_elf__ ?= $(LD) $(LDFLAGS_pbl) --gc-sections \
-e $(2) -Map $@.map $(LDFLAGS_$(@F)) -o $@ \
-T $(pbl-lds) \
--start-group $(barebox-pbl-common) $(obj)/piggy.o \