[v3 15/16] arm: socfpga: soc64: Enable FIT image generation using binman

Siew Chin Lim elly.siew.chin.lim at intel.com
Thu Oct 15 14:29:54 CEST 2020


Add new build target "fit-itb" for FIT image generation.

In preparation to support Vendor Authorized Boot (VAB) for Intel
SOC64 device in near future. With VAB, u-boot proper, dtb and
arm trusted firmware need to be signed before FIT image generation.

To align user experience for ATF boot with and without VAB
feature, we skip binman for ARCH_SOCFPGA in default Makefile
flow. User always use 'make fit-itb' to generate FIT image
after successfully compile u-boot.

Signed-off-by: Siew Chin Lim <elly.siew.chin.lim at intel.com>
---
 Makefile                      | 7 +++++++
 arch/arm/mach-socfpga/Kconfig | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/Makefile b/Makefile
index 28c9f31fb4..ed05becc9e 100644
--- a/Makefile
+++ b/Makefile
@@ -1020,8 +1020,10 @@ inputs: $(INPUTS-y)
 
 all: .binman_stamp inputs
 ifeq ($(CONFIG_BINMAN),y)
+ifneq ($(CONFIG_ARCH_SOCFPGA),y)
 	$(call if_changed,binman)
 endif
+endif
 
 # Timestamp file to make sure that binman always runs
 .binman_stamp: FORCE
@@ -1600,6 +1602,11 @@ cmd_socnandboot = cat	u-boot-spl-padx4.sfp u-boot.img > $@ || rm -f $@
 u-boot-with-nand-spl.sfp: u-boot-spl-padx4.sfp u-boot.img FORCE
 	$(call if_changed,socnandboot)
 
+ifeq ($(CONFIG_FIT),y)
+fit-itb:
+	$(call if_changed,binman)
+endif
+
 endif
 
 ifeq ($(CONFIG_MPC85xx)$(CONFIG_OF_SEPARATE),yy)
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index 01f5a1fc41..7fdb52dd83 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -37,6 +37,7 @@ config TARGET_SOCFPGA_AGILEX
 	select FPGA_INTEL_SDM_MAILBOX
 	select NCORE_CACHE
 	select SPL_CLK if SPL
+	select BINMAN
 
 config TARGET_SOCFPGA_ARRIA5
 	bool
@@ -79,6 +80,7 @@ config TARGET_SOCFPGA_STRATIX10
 	select ARMV8_MULTIENTRY
 	select ARMV8_SET_SMPEN
 	select FPGA_INTEL_SDM_MAILBOX
+	select BINMAN
 
 choice
 	prompt "Altera SOCFPGA board select"
-- 
2.13.0



More information about the U-Boot mailing list