From 4a340349bccf74ff402ae5487fcd1d7d4af5db1b Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 16 Aug 2022 19:55:02 +0200 Subject: [PATCH] boot/arm-trusted-firmware: allow to generate BL2 from RCW This patch adds the option BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW that allows TF-A to encapsulate a pre-loaded RCW (Reset Configuration Word) file into BL2. Upcoming NXP QorIQ family board needs this option. Signed-off-by: Francois Perrad Reviewed-by: Giulio Benetti Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 8 ++++++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 100ac83482..aa571502b3 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -162,6 +162,14 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_EDK2_AS_BL33 for the 'qemu_sbsa' platform. In this case, due to the EDK2 build system, the dependency between ATF and EDK is reversed. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW + bool "Include NXP RCW in BL2" + depends on BR2_PACKAGE_HOST_QORIQ_RCW + help + Include the NXP RCW (Reset Control Word) in BL2. See + package/qoriq-rcw/ for more details. This is mostly useful + on NXP LayerScape platforms. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_TARGETS string "Additional ATF make targets" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 7c4e7edb00..246c0699bb 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -144,6 +144,12 @@ define ARM_TRUSTED_FIRMWARE_BUILD_FIPTOOL endef endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_RCW),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += host-qoriq-rcw +ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += pbl +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += RCW=$(BINARIES_DIR)/PBL.bin +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31),y) ARM_TRUSTED_FIRMWARE_MAKE_TARGETS += bl31 endif