From 05b8c7da6de863561d66717735a4870f2766454c Mon Sep 17 00:00:00 2001 From: "Gervais, Francois" Date: Wed, 29 Jan 2020 16:58:23 +0000 Subject: [PATCH] boot/arm-trusted-firmware: allow additional make targets Allow specifying additional build targets for ATF. This might be more useful when using a custom git repository. For example, when using with the ATF repository from NXP QorIQ, there is a new build target 'pbl' which is used to build the pbl binary image. Note that in the specific case of the 'pbl' target, additional build variables also need to be specified through BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES. Signed-off-by: Francois Gervais Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 7 +++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 3 +++ 2 files changed, 10 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 96861c3f4d..373591d497 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -135,6 +135,13 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_BL33_IMAGE endif +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS + string "Additional ATF make targets" + help + Additional targets for the ATF build + E.G. When using the QorIQ custom ATF repository from NXP, + the target 'pbl' can be used to build the pbl binary. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES string "Additional ATF build variables" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 2133d39e6d..bf1ac46cf6 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -139,6 +139,9 @@ define ARM_TRUSTED_FIRMWARE_BL31_UBOOT_INSTALL_ELF endef endif +ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += \ + $(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS) + define ARM_TRUSTED_FIRMWARE_BUILD_CMDS $(ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(ARM_TRUSTED_FIRMWARE_MAKE_OPTS) \