aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorGravatar Luca Ceresoli <luca@lucaceresoli.net>2017-06-14 13:22:27 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-06-15 22:38:32 +0200
commit6b683515bc4d1e223ed2d0e723cf8344ec669a99 (patch)
tree30c0c15e29acb6b4efa21519de6524d15eb4069b /boot
parent6846d83b14fec69097a4ad6bd382c929fb91a315 (diff)
downloadbuildroot-6b683515bc4d1e223ed2d0e723cf8344ec669a99.tar.gz
buildroot-6b683515bc4d1e223ed2d0e723cf8344ec669a99.tar.bz2
arm-trusted-firmware: cleanup make target handling
ARM_TRUSTED_FIRMWARE_MAKE_TARGET is expanded, but it's never assigned so it is always empty. On the other hand the make targets are defined in ARM_TRUSTED_FIRMWARE_MAKE_OPTS, which should contain options, not targets. Clean it all up by moving the targets in the proper place, replacing the useless $(ARM_TRUSTED_FIRMWARE_MAKE_TARGET). Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'boot')
-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 b5ee516ec6..9bd3bfce6c 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -32,8 +32,7 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \
CROSS_COMPILE="$(TARGET_CROSS)" \
BL33=$(BINARIES_DIR)/u-boot.bin \
$(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \
- PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \
- all fip
+ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM)
ifeq ($(BR2_TARGET_VEXPRESS_FIRMWARE),y)
ARM_TRUSTED_FIRMWARE_MAKE_OPTS += SCP_BL2=$(BINARIES_DIR)/scp-fw.bin
@@ -43,7 +42,7 @@ endif
define ARM_TRUSTED_FIRMWARE_BUILD_CMDS
$(TARGET_CONFIGURE_OPTS) \
$(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \
- $(ARM_TRUSTED_FIRMWARE_MAKE_TARGET)
+ all fip
endef
define ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES_CMDS