treewide: convert u-boot,env to nvmem-layout

Non nvmem-layout is deprecated.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16376
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
index 27dfff72dec72628c45f1666c1390372c343728d..ca08284518907e4b9d641195fc1762c6a93541d4 100644 (file)
--- a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
+++ b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
@@ -127,12 +127,15 @@
                        };
 
                        partition@80000 {
-                               compatible = "u-boot,env";
                                label = "u-boot-env0";
                                reg = <0x80000 0x10000>;
                                read-only;
 
-                               macaddr_uboot_ethaddr: ethaddr {
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+
+                                       macaddr_uboot_ethaddr: ethaddr {
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts b/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts
index b2802bb855a37aaa3219ab8e18696ee71c75cb07..0a1cb5b5f7c17f3f2116245db52691bf1055f903 100644 (file)
--- a/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts
+++ b/target/linux/ath79/dts/qca9557_extreme-networks_ws-ap3805i.dts
@@ -138,12 +138,15 @@
                        };
 
                        partition@100000 {
-                               compatible = "u-boot,env";
                                label = "cfg1";
                                reg = <0x100000 0x40000>;
                                read-only;
 
-                               macaddr_uboot_ethaddr: ethaddr {
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+
+                                       macaddr_uboot_ethaddr: ethaddr {
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9557_ruckus_r500.dts b/target/linux/ath79/dts/qca9557_ruckus_r500.dts
index d4200bd3ab1a6810e0d96335a62096c0cfce994f..2e5734e2883e3a8cbef0da27e1d6f5616f4923ac 100644 (file)
--- a/target/linux/ath79/dts/qca9557_ruckus_r500.dts
+++ b/target/linux/ath79/dts/qca9557_ruckus_r500.dts
@@ -203,7 +203,6 @@
                        };
 
                        partition@100000 {
-                               compatible = "u-boot,env";
                                reg = <0x0100000 0x40000>;
                                label = "u-boot-env";
                        };

diff --git a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
index 1c4e9efca0278f45fc34c8e75f1929c13287897b..c5582a4564004ebd8ef18e9190b5eadc9e1bdf0a 100644 (file)
--- a/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
+++ b/target/linux/ath79/dts/qca9557_zyxel_nbg6616.dts
@@ -83,12 +83,15 @@
                        };
 
                        partition@30000 {
-                               compatible = "u-boot,env";
                                label = "u-boot-env";
                                reg = <0x030000 0x010000>;
 
-                               macaddr_uboot_ethaddr: ethaddr {
-                                       #nvmem-cell-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+
+                                       macaddr_uboot_ethaddr: ethaddr {
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
index 67d2f77d381b7507a72c8005521ff3a2765a9507..8dec4257192d8756a1c8fff114fe72c7936eeab2 100644 (file)
--- a/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
+++ b/target/linux/ath79/dts/qca9558_zyxel_nbg6716.dts
@@ -104,12 +104,15 @@
                        };
 
                        partition@40000 {
-                               compatible = "u-boot,env";
                                label = "u-boot-env";
                                reg = <0x040000 0x010000>;
 
-                               macaddr_uboot_ethaddr: ethaddr {
-                                       #nvmem-cell-cells = <1>;
+                               nvmem-layout {
+                                       compatible = "u-boot,env";
+
+                                       macaddr_uboot_ethaddr: ethaddr {
+                                               #nvmem-cell-cells = <1>;
+                                       };
                                };
                        };
 

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
index 887762bd232ab3e5071900dff6970e27f43691e7..efcbe962d20a6d52855cf02e4b0a38a186dd8638 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-wia3300-20.dts
@@ -169,7 +169,6 @@
                        };
 
                        partition@e0000 {
-                               compatible = "u-boot,env";
                                label = "0:APPSBLENV";
                                reg = <0x000e0000 0x00010000>;
                        };

diff --git a/target/linux/qualcommbe/patches-6.12/0305-arm64-dts-qcom-add-partition-table-for-ipq9574-rdp-c.patch b/target/linux/qualcommbe/patches-6.12/0305-arm64-dts-qcom-add-partition-table-for-ipq9574-rdp-c.patch
index 2136fa224bbb4785afe62ab2d4c06f39a74ba751..07e3f5d75ca4d1894051dcf4fc08b1265cbb7947 100644 (file)
--- a/target/linux/qualcommbe/patches-6.12/0305-arm64-dts-qcom-add-partition-table-for-ipq9574-rdp-c.patch
+++ b/target/linux/qualcommbe/patches-6.12/0305-arm64-dts-qcom-add-partition-table-for-ipq9574-rdp-c.patch
@@ -12,7 +12,7 @@ Signed-off-by: Christian Marangi <[email protected]>
 
 --- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
 +++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
-@@ -74,11 +74,155 @@
+@@ -74,11 +74,161 @@
        status = "okay";
  
        flash@0 {
@@ -125,12 +125,15 @@ Signed-off-by: Christian Marangi <[email protected]>
 +                      };
 +
 +                      partition@530000 {
-+                              compatible = "u-boot,env";
 +                              label = "0:appsblenv";
 +                              reg = <0x530000 0x10000>;
 +
-+                              macaddr_lan: ethaddr {
-+                                      #nvmem-cell-cells = <1>;
++                              nvmem-layout {
++                                      compatible = "u-boot,env";
++
++                                      macaddr_lan: ethaddr {
++                                              #nvmem-cell-cells = <1>;
++                                      };
 +                              };
 +                      };
 +