[PATCH] xilinx: zynqmp: Wire tee for Multi DTB use cases

[PATCH] xilinx: zynqmp: Wire tee for Multi DTB use cases

[Michal Simek]

Fix TEE wiring when MULTI_DTB is selected.

Signed-off-by: Michal Simek <michal.simek@amd.com>
---

 arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
index 72a8a3eb7714..40ed23b0ba6a 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
 	};
-- 
2.36.0

Re: [PATCH] xilinx: zynqmp: Wire tee for Multi DTB use cases

[Michal Simek]

st 18. 5. 2022 v 13:41 odesílatel Michal Simek <monstr@monstr.eu> napsal:
>
> Fix TEE wiring when MULTI_DTB is selected.
>
> Signed-off-by: Michal Simek <michal.simek@amd.com>
> ---
>
>  arch/arm/mach-zynqmp/mkimage_fit_atf.sh | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>
> diff --git a/arch/arm/mach-zynqmp/mkimage_fit_atf.sh b/arch/arm/mach-zynqmp/mkimage_fit_atf.sh
> index 72a8a3eb7714..40ed23b0ba6a 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
>         };
> --
> 2.36.0
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs