| Message ID | c8523a89d910ae6b8a9971b4e7b3bda89be3dc27.1652874088.git.michal.simek@amd.com |
|---|---|
| State | Accepted |
| Commit | 594f692f491f0def6c4b6543e158a7f367b35dcc |
| Delegated to: | Michal Simek |
| Headers | show |
| Series | xilinx: zynqmp: Wire tee for Multi DTB use cases | expand |
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
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 };
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(+)