From 45ba1351d61ca9024d995178bcabc869601a4dee Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 6 Oct 2024 12:50:02 -0700 Subject: [PATCH] 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 Link: https://github.com/openwrt/openwrt/pull/16618 Signed-off-by: Robert Marko --- .../linux/apm821xx/dts/netgear-wndr4700.dts | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts index c5bb3111ed..e5f4c09b13 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 { -- 2.30.2