arm: dts: imx8m: update binman ddr firmware node name

[platform/kernel/u-boot.git] / arch / arm / dts / imx8mp-u-boot.dtsi

diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index d61346d..dc57ee2 100644 (file)
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -18,6 +18,9 @@
 &clk {
        u-boot,dm-spl;
        u-boot,dm-pre-reloc;
+       /delete-property/ assigned-clocks;
+       /delete-property/ assigned-clock-parents;
+       /delete-property/ assigned-clock-rates;
 };
 
 &osc_32k {
@@ -58,28 +61,34 @@
                        align-end = <4>;
                };
 
-               blob_1: blob-ext@1 {
+               ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem_202006.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_2: blob-ext@2 {
+               ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem_202006.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
 
-               blob_3: blob-ext@3 {
+               ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem_202006.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_4: blob-ext@4 {
+               ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem_202006.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
        };
 
-       flash {
+       spl {
+               filename = "spl.bin";
+
                mkimage {
                        args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x920000";
 
@@ -94,8 +103,9 @@
 
                fit {
                        description = "Configuration to load ATF before U-Boot";
-                       #address-cells = <1>;
                        fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+                       fit,fdt-list = "of-list";
+                       #address-cells = <1>;
 
                        images {
                                uboot {
@@ -118,12 +128,13 @@
                                        load = <0x970000>;
                                        entry = <0x970000>;
 
-                                       atf_blob: blob-ext {
+                                       atf_blob: atf-blob {
                                                filename = "bl31.bin";
+                                               type = "atf-bl31";
                                        };
                                };
 
-                               fdt {
+                               @fdt-SEQ {
                                        description = "NAME";
                                        type = "flat_dt";
                                        compression = "none";
@@ -135,15 +146,30 @@
                        };
 
                        configurations {
-                               default = "conf";
+                               default = "@config-DEFAULT-SEQ";
 
-                               conf {
+                               @config-SEQ {
                                        description = "NAME";
+                                       fdt = "fdt-SEQ";
                                        firmware = "uboot";
                                        loadables = "atf";
-                                       fdt = "fdt";
                                };
                        };
                };
        };
+
+       imx-boot {
+               filename = "flash.bin";
+               pad-byte = <0x00>;
+
+               spl: blob-ext@1 {
+                       filename = "spl.bin";
+                       offset = <0x0>;
+               };
+
+               uboot: blob-ext@2 {
+                       filename = "u-boot.itb";
+                       offset = <0x58000>;
+               };
+       };
 };