From 2d930fce400a6d170275ebff802caee81c97228d Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sat, 5 Oct 2024 15:33:51 -0700 Subject: [PATCH] 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 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 --- target/linux/apm821xx/dts/meraki-mx60.dts | 26 +++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts index dd0ac652ab..0e7ec6be6d 100644 --- 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>; - nvmem-layout { - compatible = "u-boot,env"; + partition@0 { + reg = <0x0 0x20000>; + label = "u-boot-env-main"; + status = "disabled"; + + 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"; + }; }; };