From ed20ace41a58da8294b4877aa61ca752ca40d58b Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Mon, 9 Mar 2026 15:03:40 -0700 Subject: [PATCH] qualcommax: remove partition nvmem hack Before the env-size property was introduced, the solution was to wrap the nvmem-layout in a correctly sized partition. Remove now that it's not needed. Signed-off-by: Rosen Penev Link: https://github.com/openwrt/openwrt/pull/22367 Signed-off-by: Hauke Mehrtens --- .../linux/qualcommax/dts/ipq5018-scr50axe.dts | 18 +++++------------- .../qualcommax/dts/ipq5018-wn-dax3000gr.dts | 18 +++++------------- .../qualcommax/dts/ipq5018-wrc-x3000gs2.dts | 18 +++++------------- target/linux/qualcommax/dts/ipq8072-wax218.dts | 15 ++++----------- .../qualcommax/dts/ipq8074-wxr-5950ax12.dts | 15 ++++----------- 5 files changed, 23 insertions(+), 61 deletions(-) diff --git a/target/linux/qualcommax/dts/ipq5018-scr50axe.dts b/target/linux/qualcommax/dts/ipq5018-scr50axe.dts index 2f2d7034a69..e00a571d36b 100644 --- a/target/linux/qualcommax/dts/ipq5018-scr50axe.dts +++ b/target/linux/qualcommax/dts/ipq5018-scr50axe.dts @@ -300,22 +300,14 @@ compatible = "qcom,smem-part"; partition-0-appsblenv { - compatible = "fixed-partitions"; label = "0:appsblenv"; - #address-cells = <1>; - #size-cells = <1>; - partition@0 { - label = "env-data"; - reg = <0x0 0x40000>; + nvmem-layout { + compatible = "u-boot,env"; + env-size = <0x40000>; - nvmem-layout { - compatible = "u-boot,env"; - - macaddr_appsblenv_ethaddr: ethaddr { - compatible = "mac-base"; - #nvmem-cell-cells = <1>; - }; + macaddr_appsblenv_ethaddr: ethaddr { + #nvmem-cell-cells = <1>; }; }; }; diff --git a/target/linux/qualcommax/dts/ipq5018-wn-dax3000gr.dts b/target/linux/qualcommax/dts/ipq5018-wn-dax3000gr.dts index 770cd95876e..b5b473679bc 100644 --- a/target/linux/qualcommax/dts/ipq5018-wn-dax3000gr.dts +++ b/target/linux/qualcommax/dts/ipq5018-wn-dax3000gr.dts @@ -171,22 +171,14 @@ compatible = "qcom,smem-part"; partition-0-appsblenv { - compatible = "fixed-partitions"; label = "0:appsblenv"; - #address-cells = <1>; - #size-cells = <1>; - partition@0 { - label = "env-data"; - reg = <0x0 0x40000>; + nvmem-layout { + compatible = "u-boot,env"; + env-size = <0x40000>; - nvmem-layout { - compatible = "u-boot,env"; - - macaddr_appsblenv_ethaddr: ethaddr { - compatible = "mac-base"; - #nvmem-cell-cells = <1>; - }; + macaddr_appsblenv_ethaddr: ethaddr { + #nvmem-cell-cells = <1>; }; }; }; diff --git a/target/linux/qualcommax/dts/ipq5018-wrc-x3000gs2.dts b/target/linux/qualcommax/dts/ipq5018-wrc-x3000gs2.dts index 03a3bbe7d71..5f5095d9dff 100644 --- a/target/linux/qualcommax/dts/ipq5018-wrc-x3000gs2.dts +++ b/target/linux/qualcommax/dts/ipq5018-wrc-x3000gs2.dts @@ -165,22 +165,14 @@ compatible = "qcom,smem-part"; partition-0-appsblenv { - compatible = "fixed-partitions"; label = "0:appsblenv"; - #address-cells = <1>; - #size-cells = <1>; - partition@0 { - label = "env-data"; - reg = <0x0 0x40000>; + nvmem-layout { + compatible = "u-boot,env"; + env-size = <0x40000>; - nvmem-layout { - compatible = "u-boot,env"; - - macaddr_appsblenv_ethaddr: ethaddr { - compatible = "mac-base"; - #nvmem-cell-cells = <1>; - }; + macaddr_appsblenv_ethaddr: ethaddr { + #nvmem-cell-cells = <1>; }; }; }; diff --git a/target/linux/qualcommax/dts/ipq8072-wax218.dts b/target/linux/qualcommax/dts/ipq8072-wax218.dts index 8ced6318f9d..e9a9c12edfb 100644 --- a/target/linux/qualcommax/dts/ipq8072-wax218.dts +++ b/target/linux/qualcommax/dts/ipq8072-wax218.dts @@ -160,21 +160,14 @@ compatible = "qcom,smem-part"; partition-0-appsblenv { - compatible = "fixed-partitions"; label = "0:appsblenv"; read-only; - #address-cells = <1>; - #size-cells = <1>; - partition@0 { - label = "env-data"; - reg = <0x0 0x40000>; + nvmem-layout { + compatible = "u-boot,env"; + env-size = <0x40000>; - nvmem-layout { - compatible = "u-boot,env"; - - macaddr_ubootenv_ethaddr: ethaddr { - }; + macaddr_ubootenv_ethaddr: ethaddr { }; }; }; diff --git a/target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts b/target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts index f5574c19b56..f6ba5731c89 100644 --- a/target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts +++ b/target/linux/qualcommax/dts/ipq8074-wxr-5950ax12.dts @@ -188,21 +188,14 @@ compatible = "qcom,smem-part"; partition-0-appsblenv { - compatible = "fixed-partitions"; label = "0:appsblenv"; read-only; - #address-cells = <1>; - #size-cells = <1>; - partition@0 { - label = "env-data"; - reg = <0x0 0x40000>; + nvmem-layout { + compatible = "u-boot,env"; + env-size = <0x40000>; - nvmem-layout { - compatible = "u-boot,env"; - - macaddr_appsblenv_ethaddr: ethaddr { - }; + macaddr_appsblenv_ethaddr: ethaddr { }; }; };