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 c5bb3111edec68bfdb07c4f93c5cb0de7e6aec39..e5f4c09b13ec30d01beaed2d1917766d7e194832 100644 (file)
--- 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 {