aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-09-14 17:33:24 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-10-11 09:28:54 +0200
commitbaa450e0365e9a1c45d7b9197987853e1affcff9 (patch)
treeba06127ac5d0b14cad1a310a09b3a17e0761ba95
parent58e9d24952253a12dbb2b25e7470b3397b0eface (diff)
downloadbuildroot-baa450e0365e9a1c45d7b9197987853e1affcff9.tar.gz
buildroot-baa450e0365e9a1c45d7b9197987853e1affcff9.tar.bz2
boot/arm-trusted-firmware: don't pass TARGET_CONFIGURE_OPTS when building
Passing CFLAGS/CPPFLAGS in the environment confuses the ATF version provided by Marvell, and we in fact only need to pass CROSS_COMPILE, which is already in ARM_TRUSTED_FIRMWARE_MAKE_OPTS. We however keep TARGET_MAKE_ENV so that the PATH with $(HOST_DIR) is kept. This change has been tested with all current defconfigs that build ATF: - arm_juno - bananapi_m64 - freescale_imx8mqevk - friendlyarm_nanopi_a64 - friendlyarm_nanopi_neo2 - nitrogen8m - olimex_a64_olinuxino - orangepi_pc2 - orangepi_prime - orangepi_win - orangepi_zero_plus2 - pine64 - pine64_sopine - solidrun_macchiatobin_mainline - solidrun_macchiatobin_marvell - zynqmp_zcu106 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--boot/arm-trusted-firmware/arm-trusted-firmware.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 054a000a1d..19f7c4c80a 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -96,9 +96,8 @@ endif
define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
$(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL)
- $(TARGET_CONFIGURE_OPTS) \
- $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
- $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
+ $(ARM_TRUSTED_FIRMWARE_MAKE_TARGETS)
$(ARM_TRUSTED_FIRMWARE_BL31_UBOOT_BUILD)
endef