From eade90fd005957ccd5012f87642d6a71ba6fead3 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Tue, 4 Feb 2025 09:53:41 +0100 Subject: [PATCH] arm64: zynqmp: Describe images without TF-A U-Boot can run out of EL3, NS-EL2 and NS-EL1. Currently default configuration is NS-EL2 with TF-A but when TF-A is not passed and configured images can still boot just fine. That's why support this configuration and describe it via binman. Signed-off-by: Michal Simek Link: https://lore.kernel.org/r/9b3dad80138e97005df3d033b4611c9d7e05a177.1738659214.git.michal.simek@amd.com --- arch/arm/dts/zynqmp-binman-som.dts | 5 +++++ arch/arm/dts/zynqmp-binman.dts | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/arch/arm/dts/zynqmp-binman-som.dts b/arch/arm/dts/zynqmp-binman-som.dts index a66b948b266..d5b63ef604b 100644 --- a/arch/arm/dts/zynqmp-binman-som.dts +++ b/arch/arm/dts/zynqmp-binman-som.dts @@ -178,8 +178,13 @@ default = "conf-1"; conf-1 { description = "Multi DTB with TF-A/TEE"; +#if CONFIG_BL31_LOAD_ADDR firmware = "atf"; loadables = "tee", "uboot", "fdt"; +#else + firmware = "uboot"; + loadables = "fdt"; +#endif }; }; }; diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts index 16e1052a64a..252c2ad552b 100644 --- a/arch/arm/dts/zynqmp-binman.dts +++ b/arch/arm/dts/zynqmp-binman.dts @@ -87,9 +87,15 @@ default = "@conf-DEFAULT-SEQ"; @conf-SEQ { description = "NAME"; +#if CONFIG_BL31_LOAD_ADDR firmware = "atf"; loadables = "tee", "uboot"; fdt = "fdt-SEQ"; +#else + firmware = "uboot"; + loadables = "fdt"; +#endif + }; }; }; -- 2.39.5