arm: dts: k3-*-binman: Move to using ti-dm entry type

Move the DM entry in tispl.bin FIT image from default fetching an
external blob entry to fetching using ti-dm entry type. This way, the
DM entry will be populated by the TI_DM pathname if provided. Else it
will resort to the ti-dm.bin file.

Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
Reviewed-by: Andrew Davis <afd@ti.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/dts/k3-am625-sk-binman.dtsi b/arch/arm/dts/k3-am625-sk-binman.dtsi
index b7b5368886ac2d8db62f2a2c20daa089ad3a1c40..5b058bd03a078fb13dfa068908988be1d9a31527 100644 (file)
--- a/arch/arm/dts/k3-am625-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am625-sk-binman.dtsi
@@ -161,7 +161,7 @@
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
-                                       dm: blob-ext {
+                                       dm: ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };
@@ -248,7 +248,7 @@
                        images {
 
                                dm {
-                                       blob-ext {
+                                       ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };

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 ed2c4482ef044432821e1329908ec4f503c71d0c..78c371529a48663a7decc48b91c531f8d920f43c 100644 (file)
--- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
+++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
@@ -227,7 +227,7 @@
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
-                                       dm: blob-ext {
+                                       dm: ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };
@@ -310,7 +310,7 @@
                fit {
                        images {
                                dm {
-                                       blob-ext {
+                                       ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };

diff --git a/arch/arm/dts/k3-am62a-sk-binman.dtsi b/arch/arm/dts/k3-am62a-sk-binman.dtsi
index c5e027d44dac404d57fa6b6b51e44834cb5e1b5f..ec3bf7ce913b129790789347a714f402a7323bf4 100644 (file)
--- a/arch/arm/dts/k3-am62a-sk-binman.dtsi
+++ b/arch/arm/dts/k3-am62a-sk-binman.dtsi
@@ -164,7 +164,7 @@
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
-                                       dm: blob-ext {
+                                       dm: ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };
@@ -250,7 +250,7 @@
                fit {
                        images {
                                dm {
-                                       blob-ext {
+                                       ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };

diff --git a/arch/arm/dts/k3-j7200-binman.dtsi b/arch/arm/dts/k3-j7200-binman.dtsi
index 10c9d6cba7aa980d8c1016b7491696f1566ac873..38cccabaa71dd2f5ab871bb18f5800466c1f446b 100644 (file)
--- a/arch/arm/dts/k3-j7200-binman.dtsi
+++ b/arch/arm/dts/k3-j7200-binman.dtsi
@@ -200,7 +200,7 @@
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
-                                       dm: blob-ext {
+                                       dm: ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };
@@ -285,7 +285,7 @@
                fit {
                        images {
                                dm {
-                                       blob-ext {
+                                       ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };

diff --git a/arch/arm/dts/k3-j721e-binman.dtsi b/arch/arm/dts/k3-j721e-binman.dtsi
index 5ddb474e3a41e96bee57ae2fefd5ad14c1e7f3c9..dbc385a852ded38b39eba8c6a5c6f46f755f59a6 100644 (file)
--- a/arch/arm/dts/k3-j721e-binman.dtsi
+++ b/arch/arm/dts/k3-j721e-binman.dtsi
@@ -151,7 +151,7 @@
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
-                                       dm: blob-ext {
+                                       dm: ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };
@@ -282,7 +282,7 @@
                fit {
                        images {
                                dm {
-                                       blob-ext {
+                                       ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };

diff --git a/arch/arm/dts/k3-j721s2-binman.dtsi b/arch/arm/dts/k3-j721s2-binman.dtsi
index 3922007b3b7a495f3a27e3b85cdf9c66ceae045a..f17dd8e04cfa3949e1310534ad4db7ba0d9989e6 100644 (file)
--- a/arch/arm/dts/k3-j721s2-binman.dtsi
+++ b/arch/arm/dts/k3-j721s2-binman.dtsi
@@ -164,7 +164,7 @@
                                                content = <&dm>;
                                                keyfile = "custMpk.pem";
                                        };
-                                       dm: blob-ext {
+                                       dm: ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };
@@ -296,7 +296,7 @@
                fit {
                        images {
                                dm {
-                                       blob-ext {
+                                       ti-dm {
                                                filename = "ti-dm.bin";
                                        };
                                };