ARM: dts: imx: Introduce SPL and FIT labels to i.MX8M DTs binman nodes

Add binman_imx_spl and binman_imx_fit labels to nxp-imx8mimage {} and fit {}
nodes respectively, so they can be referened in board DTs no matter how deep
in the top level binman image description they are. Update current board DTs
to use those labels.

Reviewed-by: Tim Harvey <tharvey@gateworks.com>
Signed-off-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 6ab8f66256edaa70556f8e776d7b1cca6b1d0172..b9b1193823a503852a8cbb925a146458e38f5df7 100644 (file)
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -54,7 +54,7 @@
                };
 #endif
 
-               nxp-imx8mimage {
+               binman_imx_spl: nxp-imx8mimage {
                        filename = "u-boot-spl-mkimage.bin";
                        nxp,boot-from = "sd";
                        nxp,rom-version = <1>;
@@ -98,7 +98,7 @@
                        };
                };
 
-               fit {
+               binman_imx_fit: fit {
                        description = "Configuration to load ATF before U-Boot";
 #ifndef CONFIG_IMX_HAB
                        fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;

diff --git a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
index 90183aff8bcc8ba1a7a64aa2beb74833849ecd7d..183de46f66a88af7ccd18617b8d4693eba7ffc9d 100644 (file)
--- a/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi
@@ -35,12 +35,8 @@
        bootph-pre-ram;
 };
 
-&binman {
-       section {
-               fit {
-                       offset = <0x5fc00>;
-               };
-       };
+&binman_imx_fit {
+       offset = <0x5fc00>;
 };
 
 &gpio1 {

diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
index ba9967dbe4aff8dd41ea4cccea630d89eb0aeb23..c9fb33cfb73428929fbcb5980f952a5c91674a5d 100644 (file)
--- a/arch/arm/dts/imx8mn-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -103,7 +103,7 @@
                };
 #endif
 
-               nxp-imx8mimage {
+               binman_imx_spl: nxp-imx8mimage {
                        filename = "u-boot-spl-mkimage.bin";
                        nxp,boot-from = "sd";
                        nxp,rom-version = <2>;
@@ -169,7 +169,7 @@
                        };
                };
 
-               fit {
+               binman_imx_fit: fit {
                        description = "Configuration to load ATF before U-Boot";
 #ifndef CONFIG_IMX_HAB
                        fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;

diff --git a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
index cb37e28f28fded88411a81c4299a230713f65d9d..c065fb82994e17ae2cdf35e0d48b5ce9fc5c6d2f 100644 (file)
--- a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi
@@ -135,73 +135,69 @@
        bootph-pre-ram;
 };
 
-&binman {
-       section {
-               fit {
-                       images {
-                               fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast {
-                                       description = "imx8mp-dhcom-som-overlay-eth1xfast";
-                                       type = "flat_dt";
-                                       compression = "none";
-
-                                       blob-ext {
-                                               filename = "imx8mp-dhcom-som-overlay-eth1xfast.dtbo";
-                                       };
-                               };
-
-                               fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast {
-                                       description = "imx8mp-dhcom-som-overlay-eth2xfast";
-                                       type = "flat_dt";
-                                       compression = "none";
-
-                                       blob-ext {
-                                               filename = "imx8mp-dhcom-som-overlay-eth2xfast.dtbo";
-                                       };
-                               };
-
-                               fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast {
-                                       description = "imx8mp-dhcom-pdk-overlay-eth2xfast";
-                                       type = "flat_dt";
-                                       compression = "none";
-
-                                       blob-ext {
-                                               filename = "imx8mp-dhcom-pdk-overlay-eth2xfast.dtbo";
-                                       };
-                               };
-
-                               fdt-dto-imx8mp-dhcom-som-overlay-rev100 {
-                                       description = "imx8mp-dhcom-som-overlay-rev100";
-                                       type = "flat_dt";
-                                       compression = "none";
-
-                                       blob-ext {
-                                               filename = "imx8mp-dhcom-som-overlay-rev100.dtbo";
-                                       };
-                               };
-
-                               fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100 {
-                                       description = "imx8mp-dhcom-pdk3-overlay-rev100";
-                                       type = "flat_dt";
-                                       compression = "none";
-
-                                       blob-ext {
-                                               filename = "imx8mp-dhcom-pdk3-overlay-rev100.dtbo";
-                                       };
-                               };
+&binman_imx_fit {
+       images {
+               fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast {
+                       description = "imx8mp-dhcom-som-overlay-eth1xfast";
+                       type = "flat_dt";
+                       compression = "none";
+
+                       blob-ext {
+                               filename = "imx8mp-dhcom-som-overlay-eth1xfast.dtbo";
                        };
+               };
+
+               fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast {
+                       description = "imx8mp-dhcom-som-overlay-eth2xfast";
+                       type = "flat_dt";
+                       compression = "none";
+
+                       blob-ext {
+                               filename = "imx8mp-dhcom-som-overlay-eth2xfast.dtbo";
+                       };
+               };
+
+               fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast {
+                       description = "imx8mp-dhcom-pdk-overlay-eth2xfast";
+                       type = "flat_dt";
+                       compression = "none";
+
+                       blob-ext {
+                               filename = "imx8mp-dhcom-pdk-overlay-eth2xfast.dtbo";
+                       };
+               };
 
-                       configurations {
-                               default = "@config-DEFAULT-SEQ";
-
-                               @config-SEQ {
-                                       fdt = "fdt-1",
-                                             "fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast",
-                                             "fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast",
-                                             "fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast",
-                                             "fdt-dto-imx8mp-dhcom-som-overlay-rev100",
-                                             "fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100";
-                               };
+               fdt-dto-imx8mp-dhcom-som-overlay-rev100 {
+                       description = "imx8mp-dhcom-som-overlay-rev100";
+                       type = "flat_dt";
+                       compression = "none";
+
+                       blob-ext {
+                               filename = "imx8mp-dhcom-som-overlay-rev100.dtbo";
+                       };
+               };
+
+               fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100 {
+                       description = "imx8mp-dhcom-pdk3-overlay-rev100";
+                       type = "flat_dt";
+                       compression = "none";
+
+                       blob-ext {
+                               filename = "imx8mp-dhcom-pdk3-overlay-rev100.dtbo";
                        };
                };
        };
+
+       configurations {
+               default = "@config-DEFAULT-SEQ";
+
+               @config-SEQ {
+                       fdt = "fdt-1",
+                             "fdt-dto-imx8mp-dhcom-som-overlay-eth1xfast",
+                             "fdt-dto-imx8mp-dhcom-som-overlay-eth2xfast",
+                             "fdt-dto-imx8mp-dhcom-pdk-overlay-eth2xfast",
+                             "fdt-dto-imx8mp-dhcom-som-overlay-rev100",
+                             "fdt-dto-imx8mp-dhcom-pdk3-overlay-rev100";
+               };
+       };
 };

diff --git a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
index aff5dcf615df186b0825cb4307f1e93277fb2ac2..21eff6d6ad4debb76d5d02fa1dd479beae59174a 100644 (file)
--- a/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-rsb3720-a1-u-boot.dtsi
@@ -135,21 +135,17 @@
        assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_400M>;
 };
 
-&binman {
-       section {
-               fit {
-                       images {
-                               fip {
-                                       description = "Trusted Firmware FIP";
-                                       type = "firmware";
-                                       arch = "arm64";
-                                       compression = "none";
-                                       load = <0x40310000>;
-
-                                       fip_blob: blob-ext{
-                                               filename = "fip.bin";
-                                       };
-                               };
+&binman_imx_fit {
+       images {
+               fip {
+                       description = "Trusted Firmware FIP";
+                       type = "firmware";
+                       arch = "arm64";
+                       compression = "none";
+                       load = <0x40310000>;
+
+                       fip_blob: blob-ext{
+                               filename = "fip.bin";
                        };
                };
        };

diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index c4c1a1771026b3f69b47aa626c4785531c661eaf..8b5ac3faf1c19eef5cd7f12d647e25e1fbce5c38 100644 (file)
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -86,7 +86,7 @@
        section {
                pad-byte = <0x00>;
 
-               nxp-imx8mimage {
+               binman_imx_spl: nxp-imx8mimage {
                        filename = "u-boot-spl-mkimage.bin";
                        nxp,boot-from = "sd";
                        nxp,rom-version = <2>;
@@ -129,7 +129,7 @@
                        };
                };
 
-               fit {
+               binman_imx_fit: fit {
                        description = "Configuration to load ATF before U-Boot";
 #ifndef CONFIG_IMX_HAB
                        fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;

diff --git a/arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi b/arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi
index 1a4568dac65660305d032fb0cf70e2624bd9a73a..98da015a4443868c64ed2327e0328e9169bc164f 100644 (file)
--- a/arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-librem5-r4-u-boot.dtsi
@@ -10,14 +10,10 @@
        bootph-pre-ram;
 };
 
-&binman {
+&binman_imx_spl {
        section {
-               nxp-imx8mimage {
-                       section {
-                               signed-hdmi-imx8m {
-                                       filename = "signed_dp_imx8m.bin";
-                               };
-                       };
+               signed-hdmi-imx8m {
+                       filename = "signed_dp_imx8m.bin";
                };
        };
 };

diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 48dbe94f0c4b75003b2fca9d1b9378ab40e72182..72da674d245f79b35676d20a69d2170405a0ddb2 100644 (file)
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -38,7 +38,7 @@
        section {
                pad-byte = <0x00>;
 
-               nxp-imx8mimage {
+               binman_imx_spl: nxp-imx8mimage {
                        filename = "u-boot-spl-mkimage.bin";
                        nxp,boot-from = "sd";
                        nxp,rom-version = <1>;
@@ -87,7 +87,7 @@
                        };
                };
 
-               fit {
+               binman_imx_fit: fit {
                        description = "Configuration to load ATF before U-Boot";
 #ifndef CONFIG_IMX_HAB
                        fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;