]> git.ipfire.org Git - people/ms/ipfire-2.x.git/commitdiff
u-boot: Ignore LOAD segments with RWX permissions
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 15 Aug 2022 17:17:53 +0000 (17:17 +0000)
committerPeter Müller <peter.mueller@ipfire.org>
Sun, 11 Sep 2022 08:36:17 +0000 (08:36 +0000)
This is a new check in binutils which has to be disabled for some legacy
bootloaders.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/u-boot

index f7341675db68cb8af471244812f0a12005376eb3..3488204ee35d92eca06d24b8862e4d3b9b9bab6d 100644 (file)
@@ -34,6 +34,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)-$(MKIMAGE)
 SUP_ARCH   = armv6l aarch64
 
 CFLAGS    := $(patsubst -fstack-protector-strong,,$(CFLAGS))
+LDFLAGS   += --no-warn-rwx-segments
 
 ATF_VER    = 2.6
 
@@ -189,7 +190,7 @@ else
        # OrangePi Zero Plus
        cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
        cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz
-       cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=sun50i_a64 DEBUG=0 bl31
+       cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=sun50i_a64 DEBUG=0 bl31 LDFLAGS="$(LDFLAGS)"
        cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/sun50i_a64/release/bl31.bin bl31.bin
        cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
        -mkdir -pv /usr/share/u-boot/orangepi_zero_plus
@@ -204,7 +205,7 @@ else
        # Nanopi R2S
        cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
        cd $(DIR_APP) && tar axf $(DIR_DL)/arm-trusted-firmware-$(ATF_VER).tar.gz
-       cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31
+       cd $(DIR_APP)/arm-trusted-firmware-$(ATF_VER) && make PLAT=rk3328 ARCH=aarch64 DEBUG=0 bl31 LDFLAGS="$(LDFLAGS)"
        cd $(DIR_APP) && cp arm-trusted-firmware-$(ATF_VER)/build/rk3328/release/bl31/bl31.elf bl31.elf
        cd $(DIR_APP) && rm -rf arm-trusted-firmware-$(ATF_VER)
        -mkdir -pv /usr/share/u-boot/nanopi_r2s