arm64: zynqmp: Update binman configurations
Subsystems (2)
Michal Simek
maintainerv2 cover arm64: zynqmp: Update binman configurations
Hi,
I wanted to test u-boot running out of EL3 which worked before and there are some small chagnes needed. At the same time I found that TEE configuration is not using proper load address because it wasn't tested. And also DTB location can be taken directly from .config value as is done for other values.
Thanks,
Michal
Changes in v2:
- Guard CONFIG_XILINX_OF_BOARD_DTB_ADDR usage in binman
Michal Simek (3):
arm64: zynqmp: Fix TEE loading address and add hash
arm64: zynqmp: Use DTB address base from .config
arm64: zynqmp: Describe images without TF-A
arch/arm/dts/zynqmp-binman-som.dts | 16 ++++++++++--- arch/arm/dts/zynqmp-binman.dts | 37 +++++++++++++++++++++--------- 2 files changed, 39 insertions(+), 14 deletions(-)
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH v2 1/3 arm64: zynqmp: Fix TEE loading address and add hash
There is incorrect loading address listed for TEE. CONFIG_BL32_LOAD_ADDR should be used.
Also there is missing hash for this entry which is present for other nodes.
---
(no changes since v1)
arch/arm/dts/zynqmp-binman-som.dts | 7 +++++-- arch/arm/dts/zynqmp-binman.dts | 14 ++++++++++---- 2 files changed, 15 insertions(+), 6 deletions(-)
arch/arm/dts/zynqmp-binman-som.dts +5 -2
@@ -148,8 +148,11 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; - entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; + load = /bits/ 64 <CONFIG_BL32_LOAD_ADDR>; + entry = /bits/ 64 <CONFIG_BL32_LOAD_ADDR>; + hash { + algo = "md5"; + }; tee-os { optional; };
arch/arm/dts/zynqmp-binman.dts +10 -4
@@ -61,8 +61,11 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; - entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; + load = /bits/ 64 <CONFIG_BL32_LOAD_ADDR>; + entry = /bits/ 64 <CONFIG_BL32_LOAD_ADDR>; + hash { + algo = "md5"; + }; tee-os { optional; };
@@ -135,8 +138,11 @@ arch = "arm64"; compression = "none"; os = "tee"; - load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; - entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; + load = /bits/ 64 <CONFIG_BL32_LOAD_ADDR>; + entry = /bits/ 64 <CONFIG_BL32_LOAD_ADDR>; + hash { + algo = "md5"; + }; tee-os { optional; };
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH v2 2/3 arm64: zynqmp: Use DTB address base from .config
In reply to Michal SimekCONFIG_XILINX_OF_BOARD_DTB_ADDR holds DTB address which U-Boot is checking. Currently address in binman match default value but macro can be used directly.
Also sync node name (s/hash-1/hash/) and sync location to have the same order load/hash/image.
All binman DTSes are compiled that's why also guard CONFIG_XILINX_OF_BOARD_DTB_ADDR which depends on OF_BOARD || OF_SEPARATE which is a problem for mini configurations which are using OF_EMBED.
---
Changes in v2:
- Guard CONFIG_XILINX_OF_BOARD_DTB_ADDR usage in binman
arch/arm/dts/zynqmp-binman-som.dts | 4 +++- arch/arm/dts/zynqmp-binman.dts | 17 ++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-)
arch/arm/dts/zynqmp-binman-som.dts +3 -1
@@ -162,7 +162,9 @@ type = "flat_dt"; arch = "arm64"; compression = "none"; - load = <0x0 0x100000>; +#if CONFIG_XILINX_OF_BOARD_DTB_ADDR + load = /bits/ 64 <CONFIG_XILINX_OF_BOARD_DTB_ADDR>; +#endif hash { algo = "md5"; };
arch/arm/dts/zynqmp-binman.dts +10 -7
@@ -75,8 +75,10 @@ type = "flat_dt"; arch = "arm64"; compression = "none"; - load = <0x0 0x100000>; - hash-1 { +#if CONFIG_XILINX_OF_BOARD_DTB_ADDR + load = /bits/ 64 <CONFIG_XILINX_OF_BOARD_DTB_ADDR>; +#endif + hash { algo = "md5"; }; };
@@ -152,15 +154,16 @@ type = "flat_dt"; arch = "arm64"; compression = "none"; - load = <0x0 0x100000>; +#if CONFIG_XILINX_OF_BOARD_DTB_ADDR + load = /bits/ 64 <CONFIG_XILINX_OF_BOARD_DTB_ADDR>; +#endif + hash { + algo = "md5"; + }; uboot-fdt-blob { filename = "u-boot.dtb"; type = "blob-ext"; }; - hash-1 { - algo = "md5"; - }; - }; }; configurations {
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH v2 3/3 arm64: zynqmp: Describe images without TF-A
In reply to Michal SimekU-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.
---
(no changes since v1)
arch/arm/dts/zynqmp-binman-som.dts | 5 +++++ arch/arm/dts/zynqmp-binman.dts | 6 ++++++ 2 files changed, 11 insertions(+)
arch/arm/dts/zynqmp-binman-som.dts +5 -0
@@ -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 }; }; };
arch/arm/dts/zynqmp-binman.dts +6 -0
@@ -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 + }; }; };
Signature · 1 line
2.43.0