From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 13 Jul 2025 18:19:10 +0000 (-0700)
Subject: apm821xx: meraki-mr24: fix ubootenv definitions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37010e1155cd5aae77eb77eeeaee5c0486ac5223;p=thirdparty%2Fopenwrt.git

apm821xx: meraki-mr24: fix ubootenv definitions

Per the comments, this is not uboot,env but the redundant forms.

Placed under fixed-partition nodes in order to add status = "disabled".
The roots are needed for u-boot envtools to use.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16618
Signed-off-by: Robert Marko <robimarko@gmail.com>
---

diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index b0565331840..c2534c46335 100644
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -64,12 +64,20 @@
 				 * blocks (64KiB) in order to have spares
 				 * around for bad block management
 				 */
+				compatible = "fixed-partitions";
 				label = "u-boot-env";
 				reg = <0x00150000 0x00010000>;
-				read-only;
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				partition@0 {
+					reg = <0x0 0x10000>;
+					label = "u-boot-env-main";
+					status = "disabled";
 
-				nvmem-layout {
-					compatible = "u-boot,env";
+					nvmem-layout {
+						compatible = "u-boot,env-redundant-count";
+					};
 				};
 			};
 
@@ -79,9 +87,21 @@
 				 * has to be kept it in sync with the
 				 * data in "u-boot-env".
 				 */
+				compatible = "fixed-partitions";
 				label = "u-boot-env-redundant";
 				reg = <0x00160000 0x00010000>;
-				read-only;
+				#address-cells = <1>;
+				#size-cells = <1>;
+
+				partition@0 {
+					reg = <0x0 0x10000>;
+					label = "u-boot-env-redundant";
+					status = "disabled";
+
+					nvmem-layout {
+						compatible = "u-boot,env-redundant-count";
+					};
+				};
 			};
 
 			partition@170000 {