• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-cqtcocoa誰得pythonphprubygameguibathyscaphec翻訳計画中(planning stage)omegatframeworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Commit MetaInfo

Revisión25daa2cdda4cb5b48c527695fc73403376063c77 (tree)
Tiempo2022-07-26 18:29:02
AutorPeng Fan <peng.fan@nxp....>
CommiterStefano Babic

Log Message

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>

Cambiar Resumen

Diferencia incremental

--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -39,25 +39,25 @@
3939 filename = "u-boot-spl.bin";
4040 };
4141
42- 1d-imem {
42+ ddr-1d-imem-fw {
4343 filename = "lpddr4_pmu_train_1d_imem.bin";
4444 size = <0x8000>;
4545 type = "blob-ext";
4646 };
4747
48- 1d-dmem {
48+ ddr-1d-dmem-fw {
4949 filename = "lpddr4_pmu_train_1d_dmem.bin";
5050 size = <0x4000>;
5151 type = "blob-ext";
5252 };
5353
54- 2d-imem {
54+ ddr-2d-imem-fw {
5555 filename = "lpddr4_pmu_train_2d_imem.bin";
5656 size = <0x8000>;
5757 type = "blob-ext";
5858 };
5959
60- 2d-dmem {
60+ ddr-2d-dmem-fw {
6161 filename = "lpddr4_pmu_train_2d_dmem.bin";
6262 size = <0x4000>;
6363 type = "blob-ext";
--- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
@@ -147,24 +147,28 @@
147147 align-end = <4>;
148148 };
149149
150- blob_1: blob-ext@1 {
150+ ddr-1d-imem-fw {
151151 filename = "lpddr4_pmu_train_1d_imem.bin";
152152 size = <0x8000>;
153+ type = "blob-ext";
153154 };
154155
155- blob_2: blob-ext@2 {
156+ ddr-1d-dmem-fw {
156157 filename = "lpddr4_pmu_train_1d_dmem.bin";
157158 size = <0x4000>;
159+ type = "blob-ext";
158160 };
159161
160- blob_3: blob-ext@3 {
162+ ddr-2d-imem-fw {
161163 filename = "lpddr4_pmu_train_2d_imem.bin";
162164 size = <0x8000>;
165+ type = "blob-ext";
163166 };
164167
165- blob_4: blob-ext@4 {
168+ ddr-2d-dmem-fw {
166169 filename = "lpddr4_pmu_train_2d_dmem.bin";
167170 size = <0x4000>;
171+ type = "blob-ext";
168172 };
169173 };
170174
--- 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 @@
111111 filename = "u-boot-spl.bin";
112112 };
113113
114- 1d-imem {
114+ ddr-1d-imem-fw {
115115 filename = "ddr3_imem_1d.bin";
116116 size = <0x8000>;
117117 type = "blob-ext";
118118 };
119119
120- 1d_dmem {
120+ ddr-1d-dmem-fw {
121121 filename = "ddr3_dmem_1d.bin";
122122 size = <0x4000>;
123123 type = "blob-ext";
--- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
@@ -155,24 +155,28 @@
155155 align-end = <4>;
156156 };
157157
158- blob_1: blob-ext@1 {
158+ ddr-1d-imem-fw {
159159 filename = "ddr4_imem_1d_201810.bin";
160160 size = <0x8000>;
161+ type = "blob-ext";
161162 };
162163
163- blob_2: blob-ext@2 {
164+ ddr-1d-dmem-fw {
164165 filename = "ddr4_dmem_1d_201810.bin";
165166 size = <0x4000>;
167+ type = "blob-ext";
166168 };
167169
168- blob_3: blob-ext@3 {
170+ ddr-2d-imem-fw {
169171 filename = "ddr4_imem_2d_201810.bin";
170172 size = <0x8000>;
173+ type = "blob-ext";
171174 };
172175
173- blob_4: blob-ext@4 {
176+ ddr-2d-dmem-fw {
174177 filename = "ddr4_dmem_2d_201810.bin";
175178 size = <0x4000>;
179+ type = "blob-ext";
176180 };
177181 };
178182
--- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
@@ -36,24 +36,28 @@
3636 align-end = <4>;
3737 };
3838
39- blob_1: blob-ext@1 {
39+ ddr-1d-imem-fw {
4040 filename = "lpddr4_pmu_train_1d_imem.bin";
4141 size = <0x8000>;
42+ type = "blob-ext";
4243 };
4344
44- blob_2: blob-ext@2 {
45+ ddr-1d-dmem-fw {
4546 filename = "lpddr4_pmu_train_1d_dmem.bin";
4647 size = <0x4000>;
48+ type = "blob-ext";
4749 };
4850
49- blob_3: blob-ext@3 {
51+ ddr-2d-imem-fw {
5052 filename = "lpddr4_pmu_train_2d_imem.bin";
5153 size = <0x8000>;
54+ type = "blob-ext";
5255 };
5356
54- blob_4: blob-ext@4 {
57+ ddr-2d-dmem-fw {
5558 filename = "lpddr4_pmu_train_2d_dmem.bin";
5659 size = <0x4000>;
60+ type = "blob-ext";
5761 };
5862 };
5963
--- 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 @@
130130 filename = "u-boot-spl.bin";
131131 };
132132
133- 1d-imem {
133+ ddr-1d-imem-fw {
134134 filename = "ddr4_imem_1d.bin";
135135 size = <0x8000>;
136136 type = "blob-ext";
137137 };
138138
139- 1d_dmem {
139+ ddr-1d-dmem-fw {
140140 filename = "ddr4_dmem_1d.bin";
141141 size = <0x4000>;
142142 type = "blob-ext";
143143 };
144144
145- 2d_imem {
145+ ddr-2d-imem-fw {
146146 filename = "ddr4_imem_2d.bin";
147147 size = <0x8000>;
148148 type = "blob-ext";
149149 };
150150
151- 2d_dmem {
151+ ddr-2d-dmem-fw {
152152 filename = "ddr4_dmem_2d.bin";
153153 size = <0x4000>;
154154 type = "blob-ext";
--- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
@@ -126,25 +126,25 @@
126126 filename = "u-boot-spl.bin";
127127 };
128128
129- 1d-imem {
129+ ddr-1d-imem-fw {
130130 filename = "lpddr4_pmu_train_1d_imem.bin";
131131 size = <0x8000>;
132132 type = "blob-ext";
133133 };
134134
135- 1d_dmem {
135+ ddr-1d-dmem-fw {
136136 filename = "lpddr4_pmu_train_1d_dmem.bin";
137137 size = <0x4000>;
138138 type = "blob-ext";
139139 };
140140
141- 2d_imem {
141+ ddr-2d-imem-fw {
142142 filename = "lpddr4_pmu_train_2d_imem.bin";
143143 size = <0x8000>;
144144 type = "blob-ext";
145145 };
146146
147- 2d_dmem {
147+ ddr-2d-dmem-fw {
148148 filename = "lpddr4_pmu_train_2d_dmem.bin";
149149 size = <0x4000>;
150150 type = "blob-ext";
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -61,24 +61,28 @@
6161 align-end = <4>;
6262 };
6363
64- blob_1: blob-ext@1 {
64+ ddr-1d-imem-fw {
6565 filename = "lpddr4_pmu_train_1d_imem_202006.bin";
6666 size = <0x8000>;
67+ type = "blob-ext";
6768 };
6869
69- blob_2: blob-ext@2 {
70+ ddr-1d-dmem-fw {
7071 filename = "lpddr4_pmu_train_1d_dmem_202006.bin";
7172 size = <0x4000>;
73+ type = "blob-ext";
7274 };
7375
74- blob_3: blob-ext@3 {
76+ ddr-2d-imem-fw {
7577 filename = "lpddr4_pmu_train_2d_imem_202006.bin";
7678 size = <0x8000>;
79+ type = "blob-ext";
7780 };
7881
79- blob_4: blob-ext@4 {
82+ ddr-2d-dmem-fw {
8083 filename = "lpddr4_pmu_train_2d_dmem_202006.bin";
8184 size = <0x4000>;
85+ type = "blob-ext";
8286 };
8387 };
8488
--- a/arch/arm/dts/imx8mq-cm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-cm-u-boot.dtsi
@@ -28,24 +28,28 @@
2828 align-end = <4>;
2929 };
3030
31- blob_1: blob-ext@1 {
31+ ddr-1d-imem-fw {
3232 filename = "lpddr4_pmu_train_1d_imem.bin";
3333 size = <0x8000>;
34+ type = "blob-ext";
3435 };
3536
36- blob_2: blob-ext@2 {
37+ ddr-1d-dmem-fw {
3738 filename = "lpddr4_pmu_train_1d_dmem.bin";
3839 size = <0x4000>;
40+ type = "blob-ext";
3941 };
4042
41- blob_3: blob-ext@3 {
43+ ddr-2d-imem-fw {
4244 filename = "lpddr4_pmu_train_2d_imem.bin";
4345 size = <0x8000>;
46+ type = "blob-ext";
4447 };
4548
46- blob_4: blob-ext@4 {
49+ ddr-2d-dmem-fw {
4750 filename = "lpddr4_pmu_train_2d_dmem.bin";
4851 size = <0x4000>;
52+ type = "blob-ext";
4953 };
5054 };
5155
--- a/arch/arm/dts/imx8mq-u-boot.dtsi
+++ b/arch/arm/dts/imx8mq-u-boot.dtsi
@@ -46,25 +46,25 @@
4646 filename = "u-boot-spl.bin";
4747 };
4848
49- 1d-imem {
49+ ddr-1d-imem-fw {
5050 filename = "lpddr4_pmu_train_1d_imem.bin";
5151 size = <0x8000>;
5252 type = "blob-ext";
5353 };
5454
55- 1d-dmem {
55+ ddr-1d-dmem-fw {
5656 filename = "lpddr4_pmu_train_1d_dmem.bin";
5757 size = <0x4000>;
5858 type = "blob-ext";
5959 };
6060
61- 2d-imem {
61+ ddr-2d-imem-fw {
6262 filename = "lpddr4_pmu_train_2d_imem.bin";
6363 size = <0x8000>;
6464 type = "blob-ext";
6565 };
6666
67- 2d-dmem {
67+ ddr-2d-dmem-fw {
6868 filename = "lpddr4_pmu_train_2d_dmem.bin";
6969 size = <0x4000>;
7070 type = "blob-ext";