ARM: dts: imx: Convert i.MX8M flash.bin image generation to binman

[thirdparty/u-boot.git] / arch / arm / dts / imx8mq-u-boot.dtsi

diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 90b2274754bb1bff27f5090625df1d5ef0db0975..48dbe94f0c4b75003b2fca9d1b9378ab40e72182 100644 (file)
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -5,7 +5,6 @@
 
 / {
        binman: binman {
-               multiple-images;
        };
 
 };
@@ -35,65 +34,58 @@
 };
 
 &binman {
-       u-boot-spl-ddr {
-               align = <4>;
-               align-size = <4>;
-               filename = "u-boot-spl-ddr.bin";
-               pad-byte = <0xff>;
-
-               u-boot-spl {
-                       align-end = <4>;
-                       filename = "u-boot-spl.bin";
-               };
+       filename = "flash.bin";
+       section {
+               pad-byte = <0x00>;
 
-               ddr-1d-imem-fw {
-                       filename = "lpddr4_pmu_train_1d_imem.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
+               nxp-imx8mimage {
+                       filename = "u-boot-spl-mkimage.bin";
+                       nxp,boot-from = "sd";
+                       nxp,rom-version = <1>;
+                       nxp,loader-address = <CONFIG_SPL_TEXT_BASE>;
+                       args;   /* Needed by mkimage etype superclass */
 
-               ddr-1d-dmem-fw {
-                       filename = "lpddr4_pmu_train_1d_dmem.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
-
-               ddr-2d-imem-fw {
-                       filename = "lpddr4_pmu_train_2d_imem.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
+                       section {
+                               align = <4>;
+                               align-size = <4>;
+                               filename = "u-boot-spl-ddr.bin";
+                               pad-byte = <0xff>;
 
-               ddr-2d-dmem-fw {
-                       filename = "lpddr4_pmu_train_2d_dmem.bin";
-                       align-end = <4>;
-                       type = "blob-ext";
-               };
-       };
+                               u-boot-spl {
+                                       align-end = <4>;
+                                       filename = "u-boot-spl.bin";
+                               };
 
-       signed-hdmi {
-               filename = "signed_hdmi.bin";
+                               ddr-1d-imem-fw {
+                                       filename = "lpddr4_pmu_train_1d_imem.bin";
+                                       align-end = <4>;
+                                       type = "blob-ext";
+                               };
 
-               signed-hdmi-imx8m {
-                       filename = "signed_hdmi_imx8m.bin";
-                       type = "blob-ext";
-               };
-       };
+                               ddr-1d-dmem-fw {
+                                       filename = "lpddr4_pmu_train_1d_dmem.bin";
+                                       align-end = <4>;
+                                       type = "blob-ext";
+                               };
 
-       spl {
-               filename = "spl.bin";
+                               ddr-2d-imem-fw {
+                                       filename = "lpddr4_pmu_train_2d_imem.bin";
+                                       align-end = <4>;
+                                       type = "blob-ext";
+                               };
 
-               mkimage {
-                       args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000";
+                               ddr-2d-dmem-fw {
+                                       filename = "lpddr4_pmu_train_2d_dmem.bin";
+                                       align-end = <4>;
+                                       type = "blob-ext";
+                               };
 
-                       blob {
-                               filename = "u-boot-spl-ddr.bin";
+                               signed-hdmi-imx8m {
+                                       filename = "signed_hdmi_imx8m.bin";
+                                       type = "blob-ext";
+                               };
                        };
                };
-       };
-
-       itb {
-               filename = "u-boot.itb";
 
                fit {
                        description = "Configuration to load ATF before U-Boot";
@@ -158,21 +150,4 @@
                        };
                };
        };
-
-       imx-boot {
-               filename = "flash.bin";
-               pad-byte = <0x00>;
-
-               spl {
-                       filename = "spl.bin";
-                       offset = <0x0>;
-                       type = "blob-ext";
-               };
-
-               binman_uboot: uboot {
-                       filename = "u-boot.itb";
-                       offset = <0x57c00>;
-                       type = "blob-ext";
-               };
-       };
 };