summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosen Penev2024-10-06 19:55:49 +0000
committerRobert Marko2026-02-08 17:37:44 +0000
commit26254408e3f67acab2148af45d4bbad35bb5dd38 (patch)
treecbef192980e0ddc2c61da3ef0ea66636c90949c1
parent45ba1351d61ca9024d995178bcabc869601a4dee (diff)
downloadopenwrt-26254408e3f67acab2148af45d4bbad35bb5dd38.tar.gz
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 Signed-off-by: Robert Marko <robimarko@gmail.com>
-rw-r--r--target/linux/apm821xx/dts/wd-mybooklive.dts22
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";
+ };
+ };
};