[PATCH v1] arm: dts: k3-am625-verdin: add tifsstub to tispl.bin
From: Parth Pancholi parth.pancholi@toradex.com
Adds tifsstub binaries, this is required for deepsleep functionality.
This implements the same change as commit 128f81290b7d ("arm: dts: k3: binman: am625: add support for signing TIFSSTUB Images") did for TI AM62 SK board.
Signed-off-by: Parth Pancholi parth.pancholi@toradex.com Signed-off-by: Francesco Dolcini francesco.dolcini@toradex.com --- .../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 140 +++++++++++++++++- 1 file changed, 138 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi index 6f5845024f27..a9b86b61e53e 100644 --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi @@ -150,12 +150,107 @@ filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; }; }; + + tifsstub-hs { + filename = "tifsstub.bin_hs"; + ti-secure-rom { + content = <&tifsstub_hs_cert>; + core = "secure"; + load = <0x40000>; + sw-rev = <CONFIG_K3_X509_SWRV>; + keyfile = "custMpk.pem"; + countersign; + tifsstub; + }; + tifsstub_hs_cert: tifsstub-hs-cert.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; + type = "blob-ext"; + optional; + }; + tifsstub_hs_enc: tifsstub-hs-enc.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; + type = "blob-ext"; + optional; + }; + }; + + tifsstub-fs { + filename = "tifsstub.bin_fs"; + tifsstub_fs_cert: tifsstub-fs-cert.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin"; + type = "blob-ext"; + optional; + }; + tifsstub_fs_enc: tifsstub-fs-enc.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin"; + type = "blob-ext"; + optional; + }; + + }; + + tifsstub-gp { + filename = "tifsstub.bin_gp"; + ti-secure-rom { + content = <&tifsstub_gp>; + core = "secure"; + load = <0x60000>; + sw-rev = <CONFIG_K3_X509_SWRV>; + keyfile = "ti-degenerate-key.pem"; + tifsstub; + }; + tifsstub_gp: tifsstub-gp.bin { + filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin"; + type = "blob-ext"; + optional; + }; + }; + ti-spl { insert-template = <&ti_spl_template>;
fit {
images { + tifsstub-hs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-hs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_hs"; + }; + }; + + tifsstub-fs { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-fs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_fs"; + }; + }; + + tifsstub-gp { + description = "TIFSSTUB"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { ti-secure { content = <&dm>; @@ -187,7 +282,8 @@ conf-0 { description = "k3-am625-verdin-wifi-dev"; firmware = "atf"; - loadables = "tee", "dm", "spl"; + loadables = "tee", "tifsstub-hs", "tifsstub-fs", + "tifsstub-gp", "dm", "spl"; fdt = "fdt-0"; }; }; @@ -243,6 +339,45 @@
fit { images { + tifsstub-hs { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-hs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_hs"; + }; + }; + + tifsstub-fs { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-fs"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_fs"; + }; + }; + + tifsstub-gp { + description = "tifsstub"; + type = "firmware"; + arch = "arm32"; + compression = "none"; + os = "tifsstub-gp"; + load = <0x9dc00000>; + entry = <0x9dc00000>; + blob-ext { + filename = "tifsstub.bin_gp"; + }; + }; + dm { ti-dm { filename = "ti-dm.bin"; @@ -266,7 +401,8 @@ conf-0 { description = "k3-am625-verdin-wifi-dev"; firmware = "atf"; - loadables = "tee", "dm", "spl"; + loadables = "tee", "tifsstub-hs", "tifsstub-fs", + "tifsstub-gp", "dm", "spl"; fdt = "fdt-0"; }; };
Hi Francesco
On Mon, 2024-04-15 at 09:54 +0200, Francesco Dolcini wrote:
From: Parth Pancholi parth.pancholi@toradex.com
Adds tifsstub binaries, this is required for deepsleep functionality.
This implements the same change as commit 128f81290b7d ("arm: dts: k3: binman: am625: add support for signing TIFSSTUB Images") did for TI AM62 SK board.
Signed-off-by: Parth Pancholi parth.pancholi@toradex.com Signed-off-by: Francesco Dolcini francesco.dolcini@toradex.com
Acked-by: Marcel Ziswiler marcel.ziswiler@toradex.com
Just one minor note in-lined further below.
.../dts/k3-am625-verdin-wifi-dev-binman.dtsi | 140 +++++++++++++++++- 1 file changed, 138 insertions(+), 2 deletions(-)
diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev- binman.dtsi index 6f5845024f27..a9b86b61e53e 100644 --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi @@ -150,12 +150,107 @@ filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f"; }; };
- tifsstub-hs {
filename = "tifsstub.bin_hs";ti-secure-rom {content = <&tifsstub_hs_cert>;core = "secure";load = <0x40000>;sw-rev = <CONFIG_K3_X509_SWRV>;keyfile = "custMpk.pem";countersign;tifsstub;};tifsstub_hs_cert: tifsstub-hs-cert.bin {filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin";type = "blob-ext";optional;};tifsstub_hs_enc: tifsstub-hs-enc.bin {filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin";type = "blob-ext";optional;};- };
- tifsstub-fs {
filename = "tifsstub.bin_fs";tifsstub_fs_cert: tifsstub-fs-cert.bin {filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-cert.bin";type = "blob-ext";optional;};tifsstub_fs_enc: tifsstub-fs-enc.bin {filename = "ti-sysfw/ti-fs-stub-firmware-am62x-hs-enc.bin";type = "blob-ext";optional;};- };
- tifsstub-gp {
filename = "tifsstub.bin_gp";ti-secure-rom {content = <&tifsstub_gp>;core = "secure";load = <0x60000>;sw-rev = <CONFIG_K3_X509_SWRV>;keyfile = "ti-degenerate-key.pem";tifsstub;};tifsstub_gp: tifsstub-gp.bin {filename = "ti-sysfw/ti-fs-stub-firmware-am62x-gp.bin";type = "blob-ext";optional;};- };
ti-spl { insert-template = <&ti_spl_template>; fit {
We also might want to clean-up this spurious newline being a remnant of commit 4509b9ff0b8c ("arm: dts: k3-*-binman: Move to using templated FITs").
images {
tifsstub-hs {description = "TIFSSTUB";type = "firmware";arch = "arm32";compression = "none";os = "tifsstub-hs";load = <0x9dc00000>;entry = <0x9dc00000>;blob-ext {filename = "tifsstub.bin_hs";};};tifsstub-fs {description = "TIFSSTUB";type = "firmware";arch = "arm32";compression = "none";os = "tifsstub-fs";load = <0x9dc00000>;entry = <0x9dc00000>;blob-ext {filename = "tifsstub.bin_fs";};};tifsstub-gp {description = "TIFSSTUB";type = "firmware";arch = "arm32";compression = "none";os = "tifsstub-gp";load = <0x9dc00000>;entry = <0x9dc00000>;blob-ext {filename = "tifsstub.bin_gp";};};dm { ti-secure { content = <&dm>; @@ -187,7 +282,8 @@ conf-0 { description = "k3-am625-verdin-wifi-dev"; firmware = "atf";
loadables = "tee", "dm", "spl";
loadables = "tee", "tifsstub-hs", "tifsstub-fs","tifsstub-gp", "dm", "spl";fdt = "fdt-0"; }; }; @@ -243,6 +339,45 @@ fit { images {
tifsstub-hs {description = "tifsstub";type = "firmware";arch = "arm32";compression = "none";os = "tifsstub-hs";load = <0x9dc00000>;entry = <0x9dc00000>;blob-ext {filename = "tifsstub.bin_hs";};};tifsstub-fs {description = "tifsstub";type = "firmware";arch = "arm32";compression = "none";os = "tifsstub-fs";load = <0x9dc00000>;entry = <0x9dc00000>;blob-ext {filename = "tifsstub.bin_fs";};};tifsstub-gp {description = "tifsstub";type = "firmware";arch = "arm32";compression = "none";os = "tifsstub-gp";load = <0x9dc00000>;entry = <0x9dc00000>;blob-ext {filename = "tifsstub.bin_gp";};};dm { ti-dm { filename = "ti-dm.bin"; @@ -266,7 +401,8 @@ conf-0 { description = "k3-am625-verdin-wifi-dev"; firmware = "atf";
loadables = "tee", "dm", "spl";
loadables = "tee", "tifsstub-hs", "tifsstub-fs","tifsstub-gp", "dm", "spl";fdt = "fdt-0"; }; };
Cheers
Marcel
On Mon, 15 Apr 2024 09:54:58 +0200, Francesco Dolcini wrote:
Adds tifsstub binaries, this is required for deepsleep functionality.
This implements the same change as commit 128f81290b7d ("arm: dts: k3: binman: am625: add support for signing TIFSSTUB Images") did for TI AM62 SK board.
[...]
Applied to u-boot/master, thanks!
participants (3)
-
Francesco Dolcini -
Marcel Ziswiler -
Tom Rini