catspeed-cc/openwrt
2
1
Fork 0
Code Issues Pull Requests Activity

apm821xx: meraki-mx60: fix ubootenv definitions

Browse Source 
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 23bb631c4a)
Link: https://github.com/openwrt/openwrt/pull/22339
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Rosen Penev 2024-10-05 15:33:51 -07:00 committed by Robert Marko
parent 7380154d3a
commit 2d930fce40
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
target/linux/apm821xx/dts/meraki-mx60.dts
View File

@ -62,12 +62,30 @@
}; };
partition@100000 { partition@100000 {
label = "u-boot-env"; compatible = "fixed-partitions";
reg = <0x00100000 0x00100000>; reg = <0x00100000 0x00100000>;
read-only; label = "u-boot-env";
#address-cells = <1>;
#size-cells = <1>;
nvmem-layout { partition@0 {
compatible = "u-boot,env"; 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";
};
}; };
}; };