qualcommax: remove partition nvmem hack

Before the env-size property was introduced, the solution was to wrap
the nvmem-layout in a correctly sized partition.

Remove now that it's not needed.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22367
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/qualcommax/dts/ipq5018-scr50axe.dts b/target/linux/qualcommax/dts/ipq5018-scr50axe.dts
index 2f2d7034a69bbaece966e3b243bf29dea65ebd27..e00a571d36b093e4249198af32d5e6ebf76d4585 100644 (file)
--- a/target/linux/qualcommax/dts/ipq5018-scr50axe.dts
+++ b/target/linux/qualcommax/dts/ipq5018-scr50axe.dts
@@ -300,22 +300,14 @@
                        compatible = "qcom,smem-part";
 
                        partition-0-appsblenv {
-                               compatible = "fixed-partitions";
                                label = "0:appsblenv";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               partition@0 {
-                                       label = "env-data";
-                                       reg = <0x0 0x40000>;
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+                                       env-size = <0x40000>;
 
-                                       nvmem-layout {
-                                               compatible = "u-boot,env";
-
-                                               macaddr_appsblenv_ethaddr: ethaddr {
-                                                       compatible = "mac-base";
-                                                       #nvmem-cell-cells = <1>;
-                                               };
+                                       macaddr_appsblenv_ethaddr: ethaddr {
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/qualcommax/dts/ipq5018-wn-dax3000gr.dts b/target/linux/qualcommax/dts/ipq5018-wn-dax3000gr.dts
index 770cd95876e2bb40c1c3cbbe14d06d8bd33fc143..b5b473679bcc8e62c2a8401c87ecf580d6b9f1b9 100644 (file)
--- a/target/linux/qualcommax/dts/ipq5018-wn-dax3000gr.dts
+++ b/target/linux/qualcommax/dts/ipq5018-wn-dax3000gr.dts
@@ -171,22 +171,14 @@
                        compatible = "qcom,smem-part";
 
                        partition-0-appsblenv {
-                               compatible = "fixed-partitions";
                                label = "0:appsblenv";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               partition@0 {
-                                       label = "env-data";
-                                       reg = <0x0 0x40000>;
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+                                       env-size = <0x40000>;
 
-                                       nvmem-layout {
-                                               compatible = "u-boot,env";
-
-                                               macaddr_appsblenv_ethaddr: ethaddr {
-                                                       compatible = "mac-base";
-                                                       #nvmem-cell-cells = <1>;
-                                               };
+                                       macaddr_appsblenv_ethaddr: ethaddr {
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/qualcommax/dts/ipq5018-wrc-x3000gs2.dts b/target/linux/qualcommax/dts/ipq5018-wrc-x3000gs2.dts
index 03a3bbe7d71d93a82e429511e5145a974ac4ba60..5f5095d9dff6848c21c44d7f815049bc53743de1 100644 (file)
--- a/target/linux/qualcommax/dts/ipq5018-wrc-x3000gs2.dts
+++ b/target/linux/qualcommax/dts/ipq5018-wrc-x3000gs2.dts
@@ -165,22 +165,14 @@
                        compatible = "qcom,smem-part";
 
                        partition-0-appsblenv {
-                               compatible = "fixed-partitions";
                                label = "0:appsblenv";
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               partition@0 {
-                                       label = "env-data";
-                                       reg = <0x0 0x40000>;
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+                                       env-size = <0x40000>;
 
-                                       nvmem-layout {
-                                               compatible = "u-boot,env";
-
-                                               macaddr_appsblenv_ethaddr: ethaddr {
-                                                       compatible = "mac-base";
-                                                       #nvmem-cell-cells = <1>;
-                                               };
+                                       macaddr_appsblenv_ethaddr: ethaddr {
+                                               #nvmem-cell-cells = <1>;
                                        };
                                };
                        };

diff --git a/target/linux/qualcommax/dts/ipq8072-wax218.dts b/target/linux/qualcommax/dts/ipq8072-wax218.dts
index 8ced6318f9df5f4d771f5737ef6041e3ed90b06a..e9a9c12edfb138d634ce8b35569bbb7ca89bd76f 100644 (file)
--- a/target/linux/qualcommax/dts/ipq8072-wax218.dts
+++ b/target/linux/qualcommax/dts/ipq8072-wax218.dts
@@ -160,21 +160,14 @@
                        compatible = "qcom,smem-part";
 
                        partition-0-appsblenv {
-                               compatible = "fixed-partitions";
                                label = "0:appsblenv";
                                read-only;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               partition@0 {
-                                       label = "env-data";
-                                       reg = <0x0 0x40000>;
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+                                       env-size = <0x40000>;
 
-                                       nvmem-layout {
-                                               compatible = "u-boot,env";
-
-                                               macaddr_ubootenv_ethaddr: ethaddr {
-                                               };
+                                       macaddr_ubootenv_ethaddr: ethaddr {
                                        };
                                };
                        };

diff --git a/target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts b/target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts
index f5574c19b56d88bf8567db9ffa234f826141fdcd..f6ba5731c89a7bf365b05c296b0cb7aee3eaabe8 100644 (file)
--- a/target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts
+++ b/target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts
@@ -188,21 +188,14 @@
                        compatible = "qcom,smem-part";
 
                        partition-0-appsblenv {
-                               compatible = "fixed-partitions";
                                label = "0:appsblenv";
                                read-only;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
 
-                               partition@0 {
-                                       label = "env-data";
-                                       reg = <0x0 0x40000>;
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+                                       env-size = <0x40000>;
 
-                                       nvmem-layout {
-                                               compatible = "u-boot,env";
-
-                                               macaddr_appsblenv_ethaddr: ethaddr {
-                                               };
+                                       macaddr_appsblenv_ethaddr: ethaddr {
                                        };
                                };
                        };