From: Alif Zakuan Yuslaimi <[email protected]> Binman will attempt to package kernel.itb during U-Boot build, expecting Image and linux.dtb files that are not available in standard U-Boot-only builds. This would cause build warnings with missing blob errors.
Add conditional deletion of the kernel node from binman when FIT is enabled and CONFIG_SOCFPGA_SECURE_VAB_AUTH is not defined. Clean up binman node setting in Agilex device tree as this will apply to all SoC64 devices via the common the dts. Signed-off-by: Alif Zakuan Yuslaimi <[email protected]> --- Changes in v2: - Implement this for common SoC64 dts instead of only Agilex5 eMMC dts - Agilex dts clean up as this is now done in SoC64 dts arch/arm/dts/socfpga_agilex-u-boot.dtsi | 6 ------ arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi | 4 ---- arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi | 2 ++ 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/dts/socfpga_agilex-u-boot.dtsi b/arch/arm/dts/socfpga_agilex-u-boot.dtsi index c0f932d0e11..148c71a0eea 100644 --- a/arch/arm/dts/socfpga_agilex-u-boot.dtsi +++ b/arch/arm/dts/socfpga_agilex-u-boot.dtsi @@ -258,12 +258,6 @@ #dma-requests = <32>; }; -#if !defined(CONFIG_SOCFPGA_SECURE_VAB_AUTH) -&binman { - /delete-node/ kernel; -}; -#endif - #ifdef CONFIG_ARCH_SOCFPGA_AGILEX7M &sdr { compatible = "intel,sdr-ctl-agilex7m"; diff --git a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi index f2150b7eb7b..c7e0ee2bfd1 100644 --- a/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_agilex_socdk-u-boot.dtsi @@ -214,8 +214,4 @@ }; }; }; - -&binman { - /delete-node/ kernel; -}; #endif diff --git a/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi b/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi index 88f0154463d..ddd99f87942 100644 --- a/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi +++ b/arch/arm/dts/socfpga_soc64_fit-u-boot.dtsi @@ -93,6 +93,7 @@ }; }; +#if IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH) kernel { filename = "kernel.itb"; fit { @@ -150,6 +151,7 @@ }; }; }; +#endif }; #if defined(CONFIG_SOCFPGA_SECURE_VAB_AUTH) -- 2.43.7
