ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-11 15:33:03 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

include/trusted-firmware-a.mk: remove the no-warn-rwx-segments hack

Browse Source 
Since v2.12, TF-A automatically selects the no-warn-rwx-segments option if
needed.
So move this hack to the package Makefiles.

Signed-off-by: Thomas Richard <thomas.richard@bootlin.com>
Link: https://github.com/openwrt/openwrt/pull/17243
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Thomas Richard 2024-11-29 11:36:46 +01:00 committed by Hauke Mehrtens
parent 5292a2de26
commit c117d7a37a
9 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/trusted-firmware-a.mk
View File

@ -83,7 +83,6 @@ define Build/Compile/Trusted-Firmware-A
$(if $(DTC),DTC="$(DTC)") \ $(if $(DTC),DTC="$(DTC)") \
PLAT=$(PLAT) \ PLAT=$(PLAT) \
BUILD_STRING="OpenWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \ BUILD_STRING="OpenWrt v$(PKG_VERSION)-$(PKG_RELEASE) ($(VARIANT))" \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
$(TFA_MAKE_FLAGS) $(TFA_MAKE_FLAGS)
endef endef

1
package/boot/arm-trusted-firmware-bcm63xx/Makefile
View File

@ -33,6 +33,7 @@ TFA_TARGETS:= \
bcm4908 bcm4908
TFA_MAKE_FLAGS += \ TFA_MAKE_FLAGS += \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
BRCM_CHIP=$(BRCM_CHIP) BRCM_CHIP=$(BRCM_CHIP)
define Package/trusted-firmware-a/install define Package/trusted-firmware-a/install

1
package/boot/arm-trusted-firmware-mediatek/Makefile
View File

@ -569,6 +569,7 @@ TFA_TARGETS:= \
mt7988-spim-nand-ubi-comb mt7988-spim-nand-ubi-comb
TFA_MAKE_FLAGS += \ TFA_MAKE_FLAGS += \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
BOOT_DEVICE=$(BOOT_DEVICE) \ BOOT_DEVICE=$(BOOT_DEVICE) \
USE_MKIMAGE=1 MKIMAGE=$(STAGING_DIR_HOST)/bin/mkimage \ USE_MKIMAGE=1 MKIMAGE=$(STAGING_DIR_HOST)/bin/mkimage \
$(if $(findstring ddr4,$(DDR_TYPE)),DRAM_USE_DDR4=1) \ $(if $(findstring ddr4,$(DDR_TYPE)),DRAM_USE_DDR4=1) \

1
package/boot/arm-trusted-firmware-mvebu/Makefile
View File

@ -119,6 +119,7 @@ TFA_TARGETS:= \
edpu edpu
TFA_MAKE_FLAGS += \ TFA_MAKE_FLAGS += \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \ CROSS_CM3=$(BUILD_DIR)/$(CM3_GCC_NAME)-$(CM3_GCC_RELEASE)-$(CM3_GCC_VERSION)/bin/arm-none-eabi- \
BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \ BL33=$(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.bin \
MV_DDR_PATH=$(BUILD_DIR)/$(MV_DDR_NAME) \ MV_DDR_PATH=$(BUILD_DIR)/$(MV_DDR_NAME) \

3
package/boot/arm-trusted-firmware-rockchip/Makefile
View File

@ -37,6 +37,9 @@ TFA_TARGETS:= \
rk3328 \ rk3328 \
rk3399 rk3399
TFA_MAKE_FLAGS+= \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
ifeq ($(BUILD_VARIANT),rk3399) ifeq ($(BUILD_VARIANT),rk3399)
M0_GCC_NAME:=gcc-arm M0_GCC_NAME:=gcc-arm
M0_GCC_RELEASE:=11.2-2022.02 M0_GCC_RELEASE:=11.2-2022.02

1
package/boot/arm-trusted-firmware-stm32/Makefile
View File

@ -41,6 +41,7 @@ endef
TFA_TARGETS := stm32mp135f-dk TFA_TARGETS := stm32mp135f-dk
TFA_MAKE_FLAGS += \ TFA_MAKE_FLAGS += \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
ARCH=aarch32 AARCH32_SP=optee \ ARCH=aarch32 AARCH32_SP=optee \
BL32=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-tee-header_v2.bin \ BL32=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-tee-header_v2.bin \
BL32_EXTRA1=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-tee-pager_v2.bin \ BL32_EXTRA1=$(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-tee-pager_v2.bin \

3
package/boot/arm-trusted-firmware-sunxi/Makefile
View File

@ -46,6 +46,9 @@ TFA_TARGETS:= \
sunxi-h6 \ sunxi-h6 \
sunxi-h616 sunxi-h616
TFA_MAKE_FLAGS+= \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
define Package/trusted-firmware-a/install define Package/trusted-firmware-a/install
$(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31_$(BUILD_VARIANT).bin $(INSTALL_DATA) $(PKG_BUILD_DIR)/build/$(PLAT)/release/bl31.bin $(STAGING_DIR_IMAGE)/bl31_$(BUILD_VARIANT).bin

3
package/boot/rkbin/Makefile
View File

@ -71,6 +71,9 @@ TFA_TARGETS:= \
rk3568-e25 \ rk3568-e25 \
rk3588 rk3588
TFA_MAKE_FLAGS+= \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments")
ifeq ($(BUILD_VARIANT),rk3308-rock-pi-s) ifeq ($(BUILD_VARIANT),rk3308-rock-pi-s)
TPL_FILE:=rk3308_ddr_589MHz_uart0_m0_v2.07.bin TPL_FILE:=rk3308_ddr_589MHz_uart0_m0_v2.07.bin
define Download/rk3308-tpl-rock-pi-s define Download/rk3308-tpl-rock-pi-s

1
package/boot/tfa-layerscape/Makefile
View File

@ -161,6 +161,7 @@ TFA_TARGETS := \
lx2160a-rdb-sdboot lx2160a-rdb-sdboot
TFA_MAKE_FLAGS += \ TFA_MAKE_FLAGS += \
$(if $(CONFIG_BINUTILS_VERSION_2_37)$(CONFIG_BINUTILS_VERSION_2_38),,LDFLAGS="-no-warn-rwx-segments") \
fip pbl \ fip pbl \
BOOT_MODE=$(BOOT_MODE) \ BOOT_MODE=$(BOOT_MODE) \
RCW=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-rcw.bin \ RCW=$(STAGING_DIR_IMAGE)/fsl_$(BUILD_VARIANT)-rcw.bin \