treewide: convert u-boot,env to nvmem-layout

Non nvmem-layout is deprecated.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/16376
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Rosen Penev 2025-11-26 16:55:49 -08:00 committed by Hauke Mehrtens
parent 2dc3617c0b
commit 96fc2fa594
7 changed files with 29 additions and 16 deletions

View file

@ -127,14 +127,17 @@
}; };
partition@80000 { partition@80000 {
compatible = "u-boot,env";
label = "u-boot-env0"; label = "u-boot-env0";
reg = <0x80000 0x10000>; reg = <0x80000 0x10000>;
read-only; read-only;
nvmem-layout {
compatible = "u-boot,env";
macaddr_uboot_ethaddr: ethaddr { macaddr_uboot_ethaddr: ethaddr {
}; };
}; };
};
partition@90000 { partition@90000 {
label = "u-boot-env1"; label = "u-boot-env1";

View file

@ -138,14 +138,17 @@
}; };
partition@100000 { partition@100000 {
compatible = "u-boot,env";
label = "cfg1"; label = "cfg1";
reg = <0x100000 0x40000>; reg = <0x100000 0x40000>;
read-only; read-only;
nvmem-layout {
compatible = "u-boot,env";
macaddr_uboot_ethaddr: ethaddr { macaddr_uboot_ethaddr: ethaddr {
}; };
}; };
};
partition@140000 { partition@140000 {
label = "cfg2"; label = "cfg2";

View file

@ -203,7 +203,6 @@
}; };
partition@100000 { partition@100000 {
compatible = "u-boot,env";
reg = <0x0100000 0x40000>; reg = <0x0100000 0x40000>;
label = "u-boot-env"; label = "u-boot-env";
}; };

View file

@ -83,14 +83,17 @@
}; };
partition@30000 { partition@30000 {
compatible = "u-boot,env";
label = "u-boot-env"; label = "u-boot-env";
reg = <0x030000 0x010000>; reg = <0x030000 0x010000>;
nvmem-layout {
compatible = "u-boot,env";
macaddr_uboot_ethaddr: ethaddr { macaddr_uboot_ethaddr: ethaddr {
#nvmem-cell-cells = <1>; #nvmem-cell-cells = <1>;
}; };
}; };
};
partition@40000 { partition@40000 {
label = "art"; label = "art";

View file

@ -104,14 +104,17 @@
}; };
partition@40000 { partition@40000 {
compatible = "u-boot,env";
label = "u-boot-env"; label = "u-boot-env";
reg = <0x040000 0x010000>; reg = <0x040000 0x010000>;
nvmem-layout {
compatible = "u-boot,env";
macaddr_uboot_ethaddr: ethaddr { macaddr_uboot_ethaddr: ethaddr {
#nvmem-cell-cells = <1>; #nvmem-cell-cells = <1>;
}; };
}; };
};
partition@50000 { partition@50000 {
label = "art"; label = "art";

View file

@ -169,7 +169,6 @@
}; };
partition@e0000 { partition@e0000 {
compatible = "u-boot,env";
label = "0:APPSBLENV"; label = "0:APPSBLENV";
reg = <0x000e0000 0x00010000>; reg = <0x000e0000 0x00010000>;
}; };

View file

@ -12,7 +12,7 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
--- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi --- a/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi
@@ -74,11 +74,155 @@ @@ -74,11 +74,161 @@
status = "okay"; status = "okay";
flash@0 { flash@0 {
@ -125,14 +125,17 @@ Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
+ }; + };
+ +
+ partition@530000 { + partition@530000 {
+ compatible = "u-boot,env";
+ label = "0:appsblenv"; + label = "0:appsblenv";
+ reg = <0x530000 0x10000>; + reg = <0x530000 0x10000>;
+ +
+ nvmem-layout {
+ compatible = "u-boot,env";
+
+ macaddr_lan: ethaddr { + macaddr_lan: ethaddr {
+ #nvmem-cell-cells = <1>; + #nvmem-cell-cells = <1>;
+ }; + };
+ }; + };
+ };
+ +
+ partition@540000 { + partition@540000 {
+ label = "0:appsbl"; + label = "0:appsbl";