From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 27 Nov 2025 00:55:49 +0000 (-0800)
Subject: treewide: convert u-boot,env to nvmem-layout
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=96fc2fa5943bb87b4af18021a12854e5c4319a9b;p=openwrt%2Fstaging%2Fstintel.git

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

Non nvmem-layout is deprecated.

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

diff --git a/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts b/target/linux/ath79/dts/ar9344_enterasys_ws-ap3705i.dts
index 27dfff72de..ca08284518 100644
--- 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 b2802bb855..0a1cb5b5f7 100644
--- 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 d4200bd3ab..2e5734e288 100644
--- 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 1c4e9efca0..c5582a4564 100644
--- 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 67d2f77d38..8dec425719 100644
--- 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 887762bd23..efcbe962d2 100644
--- 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 2136fa224b..07e3f5d75c 100644
--- 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 <ansuelsmth@gmail.com>
 
 --- 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 <ansuelsmth@gmail.com>
 +			};
 +
 +			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>;
++					};
 +				};
 +			};
 +