imx93-u-boot: move binman description

No functional changes, only cosmetic adjustments to prepare for the next
commit.

Signed-off-by: Jérémie Dautheribes (Schneider Electric) <jeremie.dautheribes@bootlin.com>

diff --git a/arch/arm/dts/imx93-u-boot.dtsi b/arch/arm/dts/imx93-u-boot.dtsi
index b2b3d57318fce3d53fea7e68517c301a77a0e4d4..8d1a29d0bdbf6b1c72c26beada265e640c7d6c30 100644 (file)
--- a/arch/arm/dts/imx93-u-boot.dtsi
+++ b/arch/arm/dts/imx93-u-boot.dtsi
@@ -6,93 +6,91 @@
 / {
        binman: binman {
                multiple-images;
-       };
-};
 
-&A55_0 {
-       clocks = <&clk IMX93_CLK_ARM_PLL>;
-};
+               u-boot-spl-ddr {
+                       align = <4>;
+                       align-size = <4>;
+                       filename = "u-boot-spl-ddr.bin";
+                       pad-byte = <0xff>;
 
-&A55_1 {
-       clocks = <&clk IMX93_CLK_ARM_PLL>;
-};
+                       u-boot-spl {
+                               align-end = <4>;
+                               filename = "u-boot-spl.bin";
+                       };
 
-&binman {
-       u-boot-spl-ddr {
-               align = <4>;
-               align-size = <4>;
-               filename = "u-boot-spl-ddr.bin";
-               pad-byte = <0xff>;
+                       ddr-1d-imem-fw {
+                               filename = "lpddr4_imem_1d_v202201.bin";
+                               align-end = <4>;
+                               type = "blob-ext";
+                       };
 
-               u-boot-spl {
-                       align-end = <4>;
-                       filename = "u-boot-spl.bin";
-               };
+                       ddr-1d-dmem-fw {
+                               filename = "lpddr4_dmem_1d_v202201.bin";
+                               align-end = <4>;
+                               type = "blob-ext";
+                       };
 
-               ddr-1d-imem-fw {
-                       filename = "lpddr4_imem_1d_v202201.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
+                       ddr-2d-imem-fw {
+                               filename = "lpddr4_imem_2d_v202201.bin";
+                               align-end = <4>;
+                               type = "blob-ext";
+                       };
 
-               ddr-1d-dmem-fw {
-                       filename = "lpddr4_dmem_1d_v202201.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
+                       ddr-2d-dmem-fw {
+                               filename = "lpddr4_dmem_2d_v202201.bin";
+                               align-end = <4>;
+                               type = "blob-ext";
+                       };
                };
 
-               ddr-2d-imem-fw {
-                       filename = "lpddr4_imem_2d_v202201.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
+               spl {
+                       filename = "spl.bin";
+
+                       mkimage {
+                               args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x2049A000";
 
-               ddr-2d-dmem-fw {
-                       filename = "lpddr4_dmem_2d_v202201.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
+                               blob {
+                                       filename = "u-boot-spl-ddr.bin";
+                               };
+                       };
                };
-       };
 
-       spl {
-               filename = "spl.bin";
+               u-boot-container {
+                       filename = "u-boot-container.bin";
 
-               mkimage {
-                       args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x2049A000";
+                       mkimage {
+                               args = "-n u-boot-container.cfgout -T imx8image -e 0x0";
 
-                       blob {
-                               filename = "u-boot-spl-ddr.bin";
+                               blob {
+                                       filename = "u-boot.bin";
+                               };
                        };
                };
-       };
 
-       u-boot-container {
-               filename = "u-boot-container.bin";
+               imx-boot {
+                       filename = "flash.bin";
+                       pad-byte = <0x00>;
 
-               mkimage {
-                       args = "-n u-boot-container.cfgout -T imx8image -e 0x0";
+                       spl: blob-ext@1 {
+                               filename = "spl.bin";
+                               offset = <0x0>;
+                               align-size = <0x400>;
+                               align = <0x400>;
+                       };
 
-                       blob {
-                               filename = "u-boot.bin";
+                       uboot: blob-ext@2 {
+                               filename = "u-boot-container.bin";
                        };
                };
        };
+};
 
-       imx-boot {
-               filename = "flash.bin";
-               pad-byte = <0x00>;
-
-               spl: blob-ext@1 {
-                       filename = "spl.bin";
-                       offset = <0x0>;
-                       align-size = <0x400>;
-                       align = <0x400>;
-               };
+&A55_0 {
+       clocks = <&clk IMX93_CLK_ARM_PLL>;
+};
 
-               uboot: blob-ext@2 {
-                       filename = "u-boot-container.bin";
-               };
-       };
+&A55_1 {
+       clocks = <&clk IMX93_CLK_ARM_PLL>;
 };
 
 &tmu {