[PATCH 3/8] arm: dts: imx8m: update binman ddr firmware node name

3 Jun 2022

From: Peng Fan peng.fan@nxp.com
We are migrating to use BINMAN SYMBOLS, the current name is not
a valid binman type, so update to unify them.
Also add `type = "blob-ext";` for generating a valid binman symbol
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
---
 arch/arm/dts/imx8mm-u-boot.dtsi                   |  8 ++++----
 arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi        | 12 ++++++++----
 arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi |  4 ++--
 arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi          | 12 ++++++++----
 arch/arm/dts/imx8mn-evk-u-boot.dtsi               | 12 ++++++++----
 arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi  |  8 ++++----
 arch/arm/dts/imx8mn-venice-u-boot.dtsi            |  8 ++++----
 arch/arm/dts/imx8mp-u-boot.dtsi                   | 12 ++++++++----
 arch/arm/dts/imx8mq-cm-u-boot.dtsi                | 12 ++++++++----
 arch/arm/dts/imx8mq-u-boot.dtsi                   |  8 ++++----
 10 files changed, 58 insertions(+), 38 deletions(-)

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 9f66cdb65a9..86f8e1a284b 100644
--- 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 eb1dd8debba..d28bb2b2ffe 100644
--- 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 46a9d7fd78b..dc4cec250ef 100644
--- 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 4d0ecb07d4f..30ef8bc47d9 100644
--- 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 3db46d4cbcb..f366117f210 100644
--- 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 6e37622cca7..b8df6f749b0 100644
--- 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 35819553879..bcf2abd0676 100644
--- 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 20edd90cfad..dc57ee20411 100644
--- 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 e2f4b0e740d..bc7e9756c23 100644
--- 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 912a3d4a356..462c470091a 100644
--- 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";
-- 
2.36.0


    

[PATCH 3/8] arm: dts: imx8m: update binman ddr firmware node name

Peng Fan (OSS)