arm: dts: imx8m: shrink ddr firmware size to actual file size

After we switch to use BINMAN_SYMBOLS, there is no need to pad
the file size to 0x8000 and 0x4000. After we use BINMAN_SYMBOLS,
the u-boot-spl-ddr.bin shrink about 36KB with i.MX8MP-EVK.

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>

diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index c37a54ef87afee3161c90b7814cf18218c8868f3..f792b421e89fdf58a6c175d704950fe3e457def4 100644 (file)
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -41,25 +41,25 @@
 
                ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
-                       size = <0x8000>;
+                       align-end = <4>;
                        type = "blob-ext";
                };
 
                ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
-                       size = <0x4000>;
+                       align-end = <4>;
                        type = "blob-ext";
                };
 
                ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
-                       size = <0x8000>;
+                       align-end = <4>;
                        type = "blob-ext";
                };
 
                ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
-                       size = <0x4000>;
+                       align-end = <4>;
                        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 d28bb2b2ffed8023810e0d33fe7170cfc513dcc2..5f839524028c52c5b0614df7c047f1297e94b996 100644 (file)
--- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
@@ -149,26 +149,26 @@
 
                ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem.bin";
-                       size = <0x8000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem.bin";
-                       size = <0x4000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem.bin";
-                       size = <0x8000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem.bin";
-                       size = <0x4000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
        };
 

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 dc4cec250efa225b6226c284a94facfc7a57bf2c..c4ae7ca4f3140610c772c636cc18abdf0ae1cd6a 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
@@ -113,13 +113,13 @@
 
                ddr-1d-imem-fw {
                        filename = "ddr3_imem_1d.bin";
-                       size = <0x8000>;
+                       align-end = <4>;
                        type = "blob-ext";
                };
 
                ddr-1d-dmem-fw {
                        filename = "ddr3_dmem_1d.bin";
-                       size = <0x4000>;
+                       align-end = <4>;
                        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 30ef8bc47d9eeddc3f5ada2eea2f14ed89f64f21..78773c198e408cb7a4c311f73e78d1a1f5a746c3 100644 (file)
--- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
@@ -157,26 +157,26 @@
 
                ddr-1d-imem-fw {
                        filename = "ddr4_imem_1d_201810.bin";
-                       size = <0x8000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-1d-dmem-fw {
                        filename = "ddr4_dmem_1d_201810.bin";
-                       size = <0x4000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-2d-imem-fw {
                        filename = "ddr4_imem_2d_201810.bin";
-                       size = <0x8000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-2d-dmem-fw {
                        filename = "ddr4_dmem_2d_201810.bin";
-                       size = <0x4000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
        };
 

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

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 b8df6f749b0013374053ac154f106d5c44750fe8..ed1ab10ded37dedd07a9ef8a0377a86e762767ef 100644 (file)
--- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
@@ -132,25 +132,25 @@
 
                ddr-1d-imem-fw {
                        filename = "ddr4_imem_1d.bin";
-                       size = <0x8000>;
+                       align-end = <4>;
                        type = "blob-ext";
                };
 
                ddr-1d-dmem-fw {
                        filename = "ddr4_dmem_1d.bin";
-                       size = <0x4000>;
+                       align-end = <4>;
                        type = "blob-ext";
                };
 
                ddr-2d-imem-fw {
                        filename = "ddr4_imem_2d.bin";
-                       size = <0x8000>;
+                       align-end = <4>;
                        type = "blob-ext";
                };
 
                ddr-2d-dmem-fw {
                        filename = "ddr4_dmem_2d.bin";
-                       size = <0x4000>;
+                       align-end = <4>;
                        type = "blob-ext";
                };
        };

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

diff --git a/arch/arm/dts/imx8mp-u-boot.dtsi b/arch/arm/dts/imx8mp-u-boot.dtsi
index dc57ee20411f9d6ddb855f6e81bb1efe455f4d68..adb24cccc3b511416698fb3048a801c6d9212c1f 100644 (file)
--- a/arch/arm/dts/imx8mp-u-boot.dtsi
+++ b/arch/arm/dts/imx8mp-u-boot.dtsi
@@ -63,26 +63,26 @@
 
                ddr-1d-imem-fw {
                        filename = "lpddr4_pmu_train_1d_imem_202006.bin";
-                       size = <0x8000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-1d-dmem-fw {
                        filename = "lpddr4_pmu_train_1d_dmem_202006.bin";
-                       size = <0x4000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-2d-imem-fw {
                        filename = "lpddr4_pmu_train_2d_imem_202006.bin";
-                       size = <0x8000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
 
                ddr-2d-dmem-fw {
                        filename = "lpddr4_pmu_train_2d_dmem_202006.bin";
-                       size = <0x4000>;
                        type = "blob-ext";
+                       align-end = <4>;
                };
        };
 

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

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