From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 6 Oct 2024 19:50:02 +0000 (-0700)
Subject: apm821xx: wndr4700: fix uboot-env
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=45ba1351d61ca9024d995178bcabc869601a4dee;p=thirdparty%2Fopenwrt.git

apm821xx: wndr4700: fix uboot-env

With nvmem-layout, these probe errors go away.

Add status = "disabled" as the u-boot env driver can't handle redundant
environments properly. As a result, fw_printenv ends up not working
right.

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/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index c5bb3111ede..e5f4c09b13e 100644
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -191,27 +191,22 @@
 				partition@40000 {
 					label = "u-boot-env-main";
 					reg = <0x00040000 0x20000>; /* one block is 128k */
-					read-only;
+					status = "disabled";
 
 					nvmem-layout {
 						compatible = "u-boot,env-redundant-count";
 					};
 				};
 
-/*
- * Causes u_boot_env: probe of 4e4000000.ndfc:nand:partitions:partition@0:partition@60000
- * failed with error -17
- *
- *				partition@60000 {
- *					label = "u-boot-env-redundant";
- *					reg = <0x00060000 0x20000>;
- *					read-only;
- *
- *					nvmem-layout {
- *						compatible = "u-boot,env-redundant-count";
- *					};
- *				};
- */
+				partition@60000 {
+					label = "u-boot-env-redundant";
+					reg = <0x00060000 0x20000>;
+					status = "disabled";
+
+					nvmem-layout {
+						compatible = "u-boot,env-redundant-count";
+					};
+				};
 			};
 
 			partition@180000 {