apm821xx: mybooklive: fix ubootenv probe

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
(cherry picked from commit 26254408e3f67acab2148af45d4bbad35bb5dd38)
Link: https://github.com/openwrt/openwrt/pull/22339
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/apm821xx/dts/wd-mybooklive.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts
index b3ea1a61d9f241c7986e28e6df66c9ec255e7076..bd60e3c032fa04cc9f68b548467a08b84f5ef42b 100644 (file)
--- a/target/linux/apm821xx/dts/wd-mybooklive.dts
+++ b/target/linux/apm821xx/dts/wd-mybooklive.dts
@@ -50,6 +50,7 @@
                                        partition@0 {
                                                reg = <0x00000000 0x00001000>;
                                                label = "u-boot-env-1";
+                                               status = "disabled";
 
                                                nvmem-layout {
                                                        compatible = "u-boot,env-redundant-bool";
@@ -59,18 +60,15 @@
                                                };
                                        };
 
-/*
- * Causes the following warning: * sysfs: cannot create duplicate filename '/bus/nvmem/devices/u-boot-env0'
- *
- *                                     partition@1000 {
- *                                             reg = <0x00001000 0x00001000>;
- *                                             label = "u-boot-env-2";
- *
- *                                             nvmem-layout {
- *                                                     compatible = "u-boot,env-redundant-bool";
- *                                             };
- *                                     };
- */
+                                       partition@1000 {
+                                               reg = <0x00001000 0x00001000>;
+                                               label = "u-boot-env-2";
+                                               status = "disabled";
+
+                                               nvmem-layout {
+                                                       compatible = "u-boot,env-redundant-bool";
+                                               };
+                                       };
                                };