From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 9 Mar 2026 06:54:41 +0000 (-0700)
Subject: apm821xx: remove fixed-partitions nvmem hack
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3752fb51740756c2cf8768b8ddb5ea512e7e1910;p=thirdparty%2Fopenwrt.git

apm821xx: remove fixed-partitions nvmem hack

This was needed before the env-size binding was available to restrict it
to a specific size. No longer a need for this.

This should be no-op since status = "disabled";

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/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index c2534c46335..c82e908a942 100644
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -64,21 +64,8 @@
 				 * blocks (64KiB) in order to have spares
 				 * around for bad block management
 				 */
-				compatible = "fixed-partitions";
 				label = "u-boot-env";
 				reg = <0x00150000 0x00010000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-
-				partition@0 {
-					reg = <0x0 0x10000>;
-					label = "u-boot-env-main";
-					status = "disabled";
-
-					nvmem-layout {
-						compatible = "u-boot,env-redundant-count";
-					};
-				};
 			};
 
 			partition@160000 {
@@ -87,21 +74,8 @@
 				 * 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>;
-				#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 {