Skip to contentSkip to conversation

arm-trusted-firmware: cleanup make target handling

PATCH New Luca Ceresoli 2 participants 2 messages Jun 14, 2017 – Jun 15, 2017

lore
Share & tools
lore

Luca Ceresoli

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
---
 boot/arm-trusted-firmware/arm-trusted-firmware.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
boot/arm-trusted-firmware/arm-trusted-firmware.mk +2 -3
index b5ee516ec6d8..9bd3bfce6c7d 100644
@@ -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
Signature · 1 line
2.7.4
Applied
#1 lore raw

PATCH 1/1 arm-trusted-firmware: cleanup make target handling

Hello,

Quoted 5 lines · Luca Ceresoli

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.

Quoted 7 lines

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 <[email protected]>
---
 boot/arm-trusted-firmware/arm-trusted-firmware.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com