From: Michal Simek <monstr@monstr.eu>
Date: Wed, 18 May 2022 11:41:31 +0000 (+0200)
Subject: xilinx: zynqmp: Wire tee for Multi DTB use cases
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=594f692f491f0def6c4b6543e158a7f367b35dcc;p=u-boot.git

xilinx: zynqmp: Wire tee for Multi DTB use cases

Fix TEE wiring when MULTI_DTB is selected.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/c8523a89d910ae6b8a9971b4e7b3bda89be3dc27.1652874088.git.michal.simek@amd.com
---

diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
index 72a8a3eb77..40ed23b0ba 100755
--- a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
+++ b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
@@ -140,6 +140,15 @@ cat << __CONF_SECTION1_EOF
 		};
 __CONF_SECTION1_EOF
 else
+if [ -f $BL32 ]; then
+cat << __CONF_SECTION1_EOF
+		config_1 {
+			description = "Multi DTB with TF-A and TEE";
+			firmware = "atf";
+			loadables = "uboot", "tee", "fdt_1";
+		};
+__CONF_SECTION1_EOF
+else
 cat << __CONF_SECTION1_EOF
 		config_1 {
 			description = "Multi DTB with TF-A";
@@ -148,6 +157,7 @@ cat << __CONF_SECTION1_EOF
 		};
 __CONF_SECTION1_EOF
 fi
+fi
 
 cat << __ITS_EOF
 	};