apm821xx: meraki-mx60: fix ubootenv definitions

Needed to avoid probe errors.

There are two partitions from 0-20000 and 80000-100000.

This is redundant-count and not regular u-boot,env

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 23bb631c4a6fdbd2f63a48804a5c5377e2661122)
Link: https://github.com/openwrt/openwrt/pull/22339
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index dd0ac652ab33271de7ebda688984a637254c5cfa..0e7ec6be6d4b16164d97335f524f36a787cb0340 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -62,12 +62,30 @@
                        };
 
                        partition@100000 {
-                               label = "u-boot-env";
+                               compatible = "fixed-partitions";
                                reg = <0x00100000 0x00100000>;
-                               read-only;
+                               label = "u-boot-env";
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+
+                               partition@0 {
+                                       reg = <0x0 0x20000>;
+                                       label = "u-boot-env-main";
+                                       status = "disabled";
 
-                               nvmem-layout {
-                                       compatible = "u-boot,env";
+                                       nvmem-layout {
+                                               compatible = "u-boot,env-redundant-count";
+                                       };
+                               };
+
+                               partition@80000 {
+                                       reg = <0x80000 0x20000>;
+                                       label= "u-boot-env-redundant";
+                                       status = "disabled";
+
+                                       nvmem-layout {
+                                               compatible = "u-boot,env-redundant-count";
+                                       };
                                };
                        };