]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
apm821xx: remove fixed-partitions nvmem hack
authorRosen Penev <rosenp@gmail.com>
Mon, 9 Mar 2026 06:54:41 +0000 (23:54 -0700)
committerHauke Mehrtens <hauke@hauke-m.de>
Thu, 14 May 2026 21:02:47 +0000 (23:02 +0200)
This was needed before the env-size binding was available to restrict it
to a specific size. No longer a need for this.

This should be no-op since status = "disabled";

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22367
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
target/linux/apm821xx/dts/meraki-mr24.dts

index c2534c46335dbc70dc30639acdb5674d0ee21032..c82e908a9429085ac727b947da07dcda691f423a 100644 (file)
                                 * blocks (64KiB) in order to have spares
                                 * around for bad block management
                                 */
-                               compatible = "fixed-partitions";
                                label = "u-boot-env";
                                reg = <0x00150000 0x00010000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partition@0 {
-                                       reg = <0x0 0x10000>;
-                                       label = "u-boot-env-main";
-                                       status = "disabled";
-
-                                       nvmem-layout {
-                                               compatible = "u-boot,env-redundant-count";
-                                       };
-                               };
                        };
 
                        partition@160000 {
                                 * has to be kept it in sync with the
                                 * data in "u-boot-env".
                                 */
-                               compatible = "fixed-partitions";
                                label = "u-boot-env-redundant";
                                reg = <0x00160000 0x00010000>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-
-                               partition@0 {
-                                       reg = <0x0 0x10000>;
-                                       label = "u-boot-env-redundant";
-                                       status = "disabled";
-
-                                       nvmem-layout {
-                                               compatible = "u-boot,env-redundant-count";
-                                       };
-                               };
                        };
 
                        partition@170000 {