diff options
| author | Rosen Penev | 2024-10-06 19:55:49 +0000 |
|---|---|---|
| committer | Robert Marko | 2026-03-19 09:40:12 +0000 |
| commit | 32dac179996b005e9163017cd1b33dcc7da3f9ac (patch) | |
| tree | eda7c0acaacf8a31194f5e4b7ffecb956a8adae2 | |
| parent | 03605e8a3ea349f86e14fe8f93077416ce56ac1d (diff) | |
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>
| -rw-r--r-- | target/linux/apm821xx/dts/wd-mybooklive.dts | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/target/linux/apm821xx/dts/wd-mybooklive.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts index b3ea1a61d9..bd60e3c032 100644 --- 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"; + }; + }; }; |