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 <michal.si...@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 b0100b23f7f5..634118d170e0 100644
--- a/arch/arm/dts/zynqmp-binman-som.dts
+++ b/arch/arm/dts/zynqmp-binman-som.dts
@@ -174,8 +174,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 b3cda8b59eec..3348ad63ed63 100644
--- a/arch/arm/dts/zynqmp-binman.dts
+++ b/arch/arm/dts/zynqmp-binman.dts
@@ -84,9 +84,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.43.0

Reply via email to