Rather than using odd implicit blob-ext naming, explicitly specify the
type to be of blob-ext and therefore also simplify the node naming.

Signed-off-by: Patrick Wildt <patr...@blueri.se>
---
 arch/arm/dts/imx8mq-u-boot.dtsi | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 566b8b8035..b27630e3e5 100644
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -22,32 +22,37 @@
                        filename = "u-boot-spl.bin";
                };
 
-               blob_1: blob-ext@1 {
+               1d_imem {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_2: blob-ext@2 {
+               1d_dmem {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
 
-               blob_3: blob-ext@3 {
+               2d_imem {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_4: blob-ext@4 {
+               2d_dmem {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
        };
 
        signed_hdmi {
                filename = "signed_hdmi.bin";
 
-               blob_5: blob-ext@5 {
+               hdmi_imx8m {
                        filename = "signed_hdmi_imx8m.bin";
+                       type = "blob-ext";
                };
        };
 
@@ -60,9 +65,7 @@
                        blob {
                                filename = "u-boot-spl-ddr.bin";
                        };
-
                };
-
        };
 
        itb {
@@ -81,8 +84,9 @@
                                        load = <CONFIG_SYS_TEXT_BASE>;
                                        type = "standalone";
 
-                                       uboot_blob: blob-ext {
+                                       uboot_blob {
                                                filename = "u-boot-nodtb.bin";
+                                               type = "blob-ext";
                                        };
                                };
 
@@ -94,8 +98,9 @@
                                        load = <0x910000>;
                                        type = "firmware";
 
-                                       atf_blob: blob-ext {
+                                       atf_blob {
                                                filename = "bl31.bin";
+                                               type = "blob-ext";
                                        };
                                };
 
@@ -104,8 +109,9 @@
                                        description = "NAME";
                                        type = "flat_dt";
 
-                                       uboot_fdt_blob: blob-ext {
+                                       uboot_fdt_blob {
                                                filename = "u-boot.dtb";
+                                               type = "blob-ext";
                                        };
                                };
                        };
@@ -127,14 +133,16 @@
                filename = "flash.bin";
                pad-byte = <0x00>;
 
-               spl: blob-ext@1 {
+               spl {
                        filename = "spl.bin";
                        offset = <0x0>;
+                       type = "blob-ext";
                };
 
-               uboot: blob-ext@2 {
+               binman_uboot: uboot {
                        filename = "u-boot.itb";
                        offset = <0x57c00>;
+                       type = "blob-ext";
                };
        };
 };
-- 
2.34.1

Reply via email to