]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
arm: dts: phycore-am62x: Add missing tifsstub image nodes for FIT loadables
authorAristo Chen <jj251510319013@gmail.com>
Tue, 10 Jun 2025 07:41:21 +0000 (07:41 +0000)
committerTom Rini <trini@konsulko.com>
Thu, 26 Jun 2025 14:12:54 +0000 (08:12 -0600)
The phycore-am62x build was broken due to mkimage reporting an undefined
'image "tifsstub-hs"' in the 'loadables' property of the FIT configuration.
This occurred because the `loadables` field referenced `tifsstub-hs`,
`tifsstub-fs`, and `tifsstub-gp`, but no corresponding nodes were defined
under /images.

This patch was inspired by commit 622f826bf025704cbcc4f39252d4a83129a9cabb
("arm: dts: phycore-am62x: Package TIFS Stub"). It resolves the issue by
adding proper Binman nodes for each TIFS variant (`tifsstub-hs`,
`tifsstub-fs`, and `tifsstub-gp`).

Signed-off-by: Aristo Chen <aristo.chen@canonical.com>
arch/arm/dts/k3-am625-phycore-som-binman.dtsi

index 9b536d679afa3803c8af04a5df668a8eb1b9dca9..b01bc5dfead1c14223961a6a29c56ab0b08dbc4e 100644 (file)
 };
 
 &binman {
+       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_unsigned {
                insert-template = <&ti_spl_unsigned_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-dm {
                                                filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";