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

We are migrating to use binman symbols, the current names are
inconsistent across different boards, so unify them.

Also add `type = "blob-ext";`, since the new names are not valid binman
types.

Tested-by: Tim Harvey <tharvey@gateworks.com> #imx8m[m,n,p]-venice
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
[Alper: Edit commit message]
Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 76e3ee4facdc816ef33b7205dfbb42d6da3631c9..c37a54ef87afee3161c90b7814cf18218c8868f3 100644 (file)
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -39,25 +39,25 @@
                        filename = "u-boot-spl.bin";
                };
 
-               1d-imem {
+               ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               1d-dmem {
+               ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
                        size = <0x4000>;
                        type = "blob-ext";
                };
 
-               2d-imem {
+               ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               2d-dmem {
+               ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
                        size = <0x4000>;
                        type = "blob-ext";

diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
index eb1dd8debbaf238227d0ee8f4d0708fd2a1a5da0..d28bb2b2ffed8023810e0d33fe7170cfc513dcc2 100644 (file)
--- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
@@ -147,24 +147,28 @@
                        align-end = <4>;
                };
 
-               blob_1: blob-ext@1 {
+               ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_2: blob-ext@2 {
+               ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
 
-               blob_3: blob-ext@3 {
+               ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_4: blob-ext@4 {
+               ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
        };
 

diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
index 46a9d7fd78bbc6e808d47cb8beb7eab97393cce2..dc4cec250efa225b6226c284a94facfc7a57bf2c 100644 (file)
--- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
+++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
@@ -111,13 +111,13 @@
                        filename = "u-boot-spl.bin";
                };
 
-               1d-imem {
+               ddr-1d-imem-fw {
                        filename = "ddr3_imem_1d.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               1d_dmem {
+               ddr-1d-dmem-fw {
                        filename = "ddr3_dmem_1d.bin";
                        size = <0x4000>;
                        type = "blob-ext";

diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
index 4d0ecb07d4f3d9f20b71b11d03613e09451bc3ac..30ef8bc47d9eeddc3f5ada2eea2f14ed89f64f21 100644 (file)
--- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
@@ -155,24 +155,28 @@
                        align-end = <4>;
                };
 
-               blob_1: blob-ext@1 {
+               ddr-1d-imem-fw {
                        filename = "ddr4_imem_1d_201810.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_2: blob-ext@2 {
+               ddr-1d-dmem-fw {
                        filename = "ddr4_dmem_1d_201810.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
 
-               blob_3: blob-ext@3 {
+               ddr-2d-imem-fw {
                        filename = "ddr4_imem_2d_201810.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_4: blob-ext@4 {
+               ddr-2d-dmem-fw {
                        filename = "ddr4_dmem_2d_201810.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
        };
 

diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
index c0d26f1f50f30a61c5caee851aaf4d46af5f5319..a1141237aab6822365d793e2b94aa482c167c5b9 100644 (file)
--- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
@@ -36,24 +36,28 @@
                        align-end = <4>;
                };
 
-               blob_1: blob-ext@1 {
+               ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_2: blob-ext@2 {
+               ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
 
-               blob_3: blob-ext@3 {
+               ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_4: blob-ext@4 {
+               ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
        };
 

diff --git a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
index 6e37622cca719fee0a82d83fd3f424ed62ae9cc1..b8df6f749b0013374053ac154f106d5c44750fe8 100644 (file)
--- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
@@ -130,25 +130,25 @@
                        filename = "u-boot-spl.bin";
                };
 
-               1d-imem {
+               ddr-1d-imem-fw {
                        filename = "ddr4_imem_1d.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               1d_dmem {
+               ddr-1d-dmem-fw {
                        filename = "ddr4_dmem_1d.bin";
                        size = <0x4000>;
                        type = "blob-ext";
                };
 
-               2d_imem {
+               ddr-2d-imem-fw {
                        filename = "ddr4_imem_2d.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               2d_dmem {
+               ddr-2d-dmem-fw {
                        filename = "ddr4_dmem_2d.bin";
                        size = <0x4000>;
                        type = "blob-ext";

diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
index 358195538797e27ffa80e8208a32e6dbb4421e0e..bcf2abd0676b94a03c7ac29495bff6c132a2c6e4 100644 (file)
--- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
@@ -126,25 +126,25 @@
                        filename = "u-boot-spl.bin";
                };
 
-               1d-imem {
+               ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               1d_dmem {
+               ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
                        size = <0x4000>;
                        type = "blob-ext";
                };
 
-               2d_imem {
+               ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               2d_dmem {
+               ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
                        size = <0x4000>;
                        type = "blob-ext";

diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index 20edd90cfad8f12c58011293d50bc0ef10a5953e..dc57ee20411f9d6ddb855f6e81bb1efe455f4d68 100644 (file)
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -61,24 +61,28 @@
                        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";
                };
        };
 

diff --git a/arch/arm/dts/imx8mq-cm-u-boot.dtsi b/arch/arm/dts/imx8mq-cm-u-boot.dtsi
index e2f4b0e740d82ece3005259d59ee6c26362ba750..bc7e9756c239609349ea8743f7ca8e25c35eb70c 100644 (file)
--- a/arch/arm/dts/imx8mq-cm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-cm-u-boot.dtsi
@@ -28,24 +28,28 @@
                        align-end = <4>;
                };
 
-               blob_1: blob-ext@1 {
+               ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_2: blob-ext@2 {
+               ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
 
-               blob_3: blob-ext@3 {
+               ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
                        size = <0x8000>;
+                       type = "blob-ext";
                };
 
-               blob_4: blob-ext@4 {
+               ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
                        size = <0x4000>;
+                       type = "blob-ext";
                };
        };
 

diff --git a/arch/arm/dts/imx8mq-u-boot.dtsi b/arch/arm/dts/imx8mq-u-boot.dtsi
index 912a3d4a356c499bc78745ea280a229b8974cfc8..462c470091ac56484c2c8d7dccd879411ee1af39 100644 (file)
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -46,25 +46,25 @@
                        filename = "u-boot-spl.bin";
                };
 
-               1d-imem {
+               ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               1d-dmem {
+               ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
                        size = <0x4000>;
                        type = "blob-ext";
                };
 
-               2d-imem {
+               ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
                        size = <0x8000>;
                        type = "blob-ext";
                };
 
-               2d-dmem {
+               ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
                        size = <0x4000>;
                        type = "blob-ext";