]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
arm: dts: k3: binman: Fix DM firmware selection
authorAndrew Davis <afd@ti.com>
Fri, 25 Apr 2025 22:54:03 +0000 (17:54 -0500)
committerTom Rini <trini@konsulko.com>
Fri, 2 May 2025 21:32:45 +0000 (15:32 -0600)
Just like TF-A and OP-TEE, the documentation states a custom path for DM
can be provided at build time by setting TI_DM. This should then set
ti-dm-path which updates ti-dm node filenames in binman.

Two issues prevent this from functioning for most K3 boards. One is when
then DM firmware name is inside a blob-ext node instead of a ti-dm node.

The second is when the filename in the ti-dm node is a pointer to a
blob-ext node. In this case even though the filename is updated, the
filename in the blob-ext is not, so build can fail if the default
file in the blob-ext cannot be found, even if the updated ti-dm file
does exist.

Fix both of these for all K3 by removing any indirect ti-dm nodes and
making sure all DM nodes are labeled with "ti-dm".

Signed-off-by: Andrew Davis <afd@ti.com>
Reviewed-by: Bryan Brattlof <bb@ti.com>
Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
17 files changed:
arch/arm/dts/k3-am625-beagleplay-u-boot.dtsi
arch/arm/dts/k3-am625-phycore-som-binman.dtsi
arch/arm/dts/k3-am625-sk-binman.dtsi
arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
arch/arm/dts/k3-am62a-phycore-som-binman.dtsi
arch/arm/dts/k3-am62a-sk-binman.dtsi
arch/arm/dts/k3-am62p-sk-binman.dtsi
arch/arm/dts/k3-am67a-beagley-ai-u-boot.dtsi
arch/arm/dts/k3-am69-sk-u-boot.dtsi
arch/arm/dts/k3-j7200-binman.dtsi
arch/arm/dts/k3-j721e-beagleboneai64-u-boot.dtsi
arch/arm/dts/k3-j721e-binman.dtsi
arch/arm/dts/k3-j721s2-binman.dtsi
arch/arm/dts/k3-j722s-binman.dtsi
arch/arm/dts/k3-j742s2-evm-u-boot.dtsi
arch/arm/dts/k3-j784s4-binman.dtsi
arch/arm/dts/k3-j784s4-evm-u-boot.dtsi

index a067b0ba3543d7659928b7721f99e2fc20721188..01b6a8e417ca1016cb68b5add248b10b0bd7857a 100644 (file)
 #define AM625_BEAGLEPLAY_DTB "dts/upstream/src/arm64/ti/k3-am625-beagleplay.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-               };
-       };
-
        tifsstub-gp {
                filename = "tifsstub.bin_gp";
                ti-secure-rom {
                                        os = "DM";
                                        load = <0x89000000>;
                                        entry = <0x89000000>;
-                                       blob-ext {
-                                               filename = "ti-dm.bin";
+                                       ti-dm {
+                                               filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
                                        };
                                };
 
index 4a65427e87782809e4f1d4e91b833fb5bb00f602..9b536d679afa3803c8af04a5df668a8eb1b9dca9 100644 (file)
 #define AM625_PHYBOARD_LYRA_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-               };
-       };
-
        tifsstub-hs {
                filename = "tifsstub.bin_hs";
                ti-secure-rom {
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
-                                       dm: blob-ext {
-                                               filename = "ti-dm.bin";
+                                       dm: ti-dm {
+                                               filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
                                        };
                                };
 
                fit {
                        images {
                                dm {
-                                       blob-ext {
-                                               filename = "ti-dm.bin";
+                                       ti-dm {
+                                               filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
                                        };
                                };
 
index 534eb14795b3dea6d064073a2b797af65b3cc824..cc619f5920e2bdf218fe11f4b5d20873c154edd6 100644 (file)
 #define AM625_SK_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
-
        tifsstub-hs {
                filename = "tifsstub.bin_hs";
                ti-secure-rom {
                                                keyfile = "custMpk.pem";
                                        };
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
 
                                dm {
                                        ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index 0e6188907e474bf704663e4e7e8f48468695169b..5a8788b227b12d9f106488e1f89e1c1a49e72bf2 100644 (file)
 #define VERDIN_AM62_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-               };
-       };
-
        tifsstub-hs {
                filename = "tifsstub.bin_hs";
                ti-secure-rom {
                                                keyfile = "custMpk.pem";
                                        };
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
                                        };
                                };
 
 
                                dm {
                                        ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62xx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
                                        };
                                };
 
index 325702ed6e0603ee1d6572d857cf0381c7e99a3a..1871926c207765560a4be644fcd6a46c111b6a7c 100644 (file)
 #define AM62A7_PHYBOARD_LYRA_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/am62axx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
-
        tifsstub-hs {
                filename = "tifsstub.bin_hs";
                ti-secure-rom {
                                                keyfile = "custMpk.pem";
                                        };
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62axx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
                                };
                                dm {
                                        ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62axx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index 2a8c260387b2ef79e4c71bc499ed509e3dc2c005..ed973541ffffc5709e403b1ea756267730a8d061 100644 (file)
 #define AM62A7_SK_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/am62axx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
-
        tifsstub-hs {
                filename = "tifsstub.bin_hs";
                ti-secure-rom {
                                                keyfile = "custMpk.pem";
                                        };
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62axx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
                                };
                                dm {
                                        ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62axx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index 797644a7e0d5f1473394f1280d5f2936a304e905..8216add3498b3d0c63dfefd5b6862dee2a90584c 100644 (file)
 #define AM62PX_SK_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-
-               blob-ext {
-                       filename = "ti-dm/am62pxx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
        tifsstub-hs {
                filename = "tifsstub.bin_hs";
                ti-secure-rom {
                                        };
 
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/am62pxx/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index 6c52038cdcafe93a38e1a9734005d3fbc86fc865..f1666f1ef760128f4520273d3596a06303fb75a8 100644 (file)
 #define BEAGLEY_AI_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-
-               blob-ext {
-                       filename = "ti-dm/j722s/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
-
        ti-spl {
                insert-template = <&ti_spl_template>;
 
                                        };
 
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/j722s/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index 2f119508e1846d5ce169dde7e983bd6a8666b922..fc686087023015284312d8f07ba2a4479d40c5a6 100644 (file)
 #else // CONFIG_ARM64
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-
-               blob-ext {
-                       filename = "ti-dm/j784s4/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
-
        tispl {
                insert-template = <&ti_spl>;
+
+               fit {
+                       images {
+                               dm {
+                                       ti-dm {
+                                               filename = "ti-dm/j784s4/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                       };
+                               };
+                       };
+               };
        };
 
        u-boot {
 
        tispl-unsigned {
                insert-template = <&ti_spl_unsigned>;
+
+               fit {
+                       images {
+                               dm {
+                                       ti-dm {
+                                               filename = "ti-dm/j784s4/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                       };
+                               };
+                       };
+               };
        };
 
        u-boot-unsigned {
index 423badd7cb532fd13a6bfe15b7d49eeea930b500..47a4cde6b8544e7363e01fd3db775948474797de 100644 (file)
 #define J7200_EVM_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/j7200/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
        ti-spl {
                insert-template = <&ti_spl_template>;
 
                                                keyfile = "custMpk.pem";
                                        };
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/j7200/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
                        images {
                                dm {
                                        ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/j7200/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index 8cefa39290d91b395ad9d5fc7d67f459210b6f15..6a773c1b3d16ea3d57da3e1e25723527e06cb37b 100644 (file)
 #define J721E_BBAI64_DTB "dts/upstream/src/arm64/ti/k3-j721e-beagleboneai64.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/j721e/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-               };
-       };
-
        ti-spl_unsigned {
                filename = "tispl.bin_unsigned";
                pad-byte = <0xff>;
                                        os = "DM";
                                        load = <0x89000000>;
                                        entry = <0x89000000>;
-                                       blob-ext {
-                                               filename = "ti-dm.bin";
+                                       ti-dm {
+                                               filename = "ti-dm/j721e/ipc_echo_testb_mcu1_0_release_strip.xer5f";
                                        };
                                };
 
index 0d607296f0e208d12185b3241cc6d445784accf7..6adfab164ee2fdf6a0f36082d4b21e0a706cecca 100644 (file)
 #define J721E_EVM_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/j721e/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
        ti-spl {
                insert-template = <&ti_spl_template>;
 
                                                keyfile = "custMpk.pem";
                                        };
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/j721e/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
                        images {
                                dm {
                                        ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/j721e/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index d121d8c0c544256dd721f3e225e2d40ed0bcd96d..73af184d27ed4c8c4db6bbddd494f1550c465089 100644 (file)
 #define J721S2_EVM_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-               blob-ext {
-                       filename = "ti-dm/j721s2/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
        ti-spl {
                insert-template = <&ti_spl_template>;
 
                                                keyfile = "custMpk.pem";
                                        };
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/j721s2/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
                        images {
                                dm {
                                        ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/j721s2/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index 6b521166575676453bbc7e9b62d1f3e361a8b8dd..8f1471371e5bfa80b05d0165e5fe6644a11c322f 100644 (file)
 #define J722S_EVM_DTB "u-boot.dtb"
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-
-               blob-ext {
-                       filename = "ti-dm/j722s/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
-
        ti-spl {
                insert-template = <&ti_spl_template>;
 
                                        };
 
                                        dm: ti-dm {
-                                               filename = "ti-dm.bin";
+                                               filename = "ti-dm/j722s/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                               optional;
                                        };
                                };
 
index ede5d6e58f5ea926831dc741a6df77afa8d69fc7..b1d79a3f64a4c7cbaa7082a236ceb16849d8e33a 100644 (file)
 #else // CONFIG_ARM64
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-
-               blob-ext {
-                       filename = "ti-dm/j742s2/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
-
        tispl {
                insert-template = <&ti_spl>;
+
+               fit {
+                       images {
+                               dm {
+                                       ti-dm {
+                                               filename = "ti-dm/j742s2/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                       };
+                               };
+                       };
+               };
        };
 
        u-boot {
 
        tispl-unsigned {
                insert-template = <&ti_spl_unsigned>;
+
+               fit {
+                       images {
+                               dm {
+                                       ti-dm {
+                                               filename = "ti-dm/j742s2/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                       };
+                               };
+                       };
+               };
        };
 
        u-boot-unsigned {
index 0553825b38350890ae00a3c41663cbb842cbc65e..cb1fbc6592355a453a17bf126b163f2eddc1962d 100644 (file)
                                                keyfile = "custMpk.pem";
                                        };
 
-                                       dm: blob-ext {
-                                               filename = "ti-dm.bin";
+                                       dm: ti-dm {
+                                               optional;
                                        };
                                };
 
                fit {
                        images {
                                dm {
-                                       blob-ext {
-                                               filename = "ti-dm.bin";
+                                       ti-dm {
+                                               optional;
                                        };
                                };
 
index 8a60d7c61075b60a7be534a1a98f8a9017c4343d..cc0b562d27e5cf2297f24e99ad11d145caf76ca3 100644 (file)
 #else // CONFIG_ARM64
 
 &binman {
-       ti-dm {
-               filename = "ti-dm.bin";
-
-               blob-ext {
-                       filename = "ti-dm/j784s4/ipc_echo_testb_mcu1_0_release_strip.xer5f";
-                       optional;
-               };
-       };
-
        tispl {
                insert-template = <&ti_spl>;
+
+               fit {
+                       images {
+                               dm {
+                                       ti-dm {
+                                               filename = "ti-dm/j784s4/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                       };
+                               };
+                       };
+               };
        };
 
        u-boot {
 
        tispl-unsigned {
                insert-template = <&ti_spl_unsigned>;
+
+               fit {
+                       images {
+                               dm {
+                                       ti-dm {
+                                               filename = "ti-dm/j784s4/ipc_echo_testb_mcu1_0_release_strip.xer5f";
+                                       };
+                               };
+                       };
+               };
        };
 
        u-boot-unsigned {