kernel: disable non layout u-boot,env

All users of regular CONFIG_NVMEM_U_BOOOT_ENV have been converted to use
layouts.

CONFIG_NVMEM_U_BOOT_ENV selects the layout variant anyway so this is
safe to do.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/16376
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/apm821xx/config-6.12 b/target/linux/apm821xx/config-6.12
index 7d9f4b74be755284c95e266168e80497b85bafce..e242b05723d70fd6ce06220263795e9b165d43c2 100644 (file)
--- a/target/linux/apm821xx/config-6.12
+++ b/target/linux/apm821xx/config-6.12
@@ -176,7 +176,6 @@ CONFIG_NVMEM=y
 CONFIG_NVMEM_LAYOUTS=y
 CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y

diff --git a/target/linux/ath79/config-6.12 b/target/linux/ath79/config-6.12
index 9c723ab6b839e330357b0dcfe1955d76b447ab4e..7bf22048606b0d5f902c8b7e03a1b131aa7b839c 100644 (file)
--- a/target/linux/ath79/config-6.12
+++ b/target/linux/ath79/config-6.12
@@ -153,7 +153,6 @@ CONFIG_NVMEM=y
 CONFIG_NVMEM_LAYOUTS=y
 CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y

diff --git a/target/linux/ath79/mikrotik/config-default b/target/linux/ath79/mikrotik/config-default
index 57b697a13d5e78a82656b52b77aee85f5cb561a7..991ab7a3acda05f42d52fdfba8b363855b67abb7 100644 (file)
--- a/target/linux/ath79/mikrotik/config-default
+++ b/target/linux/ath79/mikrotik/config-default
@@ -36,7 +36,6 @@ CONFIG_NET_DSA=y
 # CONFIG_NVMEM_LAYOUT_MIKROTIK is not set
 # CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set
 # CONFIG_NVMEM_SYSFS is not set
-# CONFIG_NVMEM_U_BOOT_ENV is not set
 CONFIG_PHYLINK=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_SGL_ALLOC=y

diff --git a/target/linux/bcm4908/config-6.12 b/target/linux/bcm4908/config-6.12
index f65adb4bf6c6560cdb6f4576ed4ed191f82fd064..54c56bb388e2dcc0c0e56bc99a34dd05db04f3b1 100644 (file)
--- a/target/linux/bcm4908/config-6.12
+++ b/target/linux/bcm4908/config-6.12
@@ -202,7 +202,6 @@ CONFIG_NVMEM=y
 CONFIG_NVMEM_LAYOUTS=y
 CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y

diff --git a/target/linux/ipq40xx/config-6.12 b/target/linux/ipq40xx/config-6.12
index 320faf6cd85710845f9b0f3389f4a775d62da737..d822dadfd744d6618848344b81140c5d6f32184b 100644 (file)
--- a/target/linux/ipq40xx/config-6.12
+++ b/target/linux/ipq40xx/config-6.12
@@ -336,7 +336,6 @@ CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y

diff --git a/target/linux/ipq806x/config-6.12 b/target/linux/ipq806x/config-6.12
index dbda0cc7526c55b3c9798448509870c94b14c742..6ade610d56a3440afbf24166d7657e5706bc95bc 100644 (file)
--- a/target/linux/ipq806x/config-6.12
+++ b/target/linux/ipq806x/config-6.12
@@ -331,7 +331,6 @@ CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
 # CONFIG_NVMEM_SPMI_SDAM is not set
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y

diff --git a/target/linux/mediatek/filogic/config-6.12 b/target/linux/mediatek/filogic/config-6.12
index 9928fb309086051db1483bc17bd2429b91663c24..1fae94f012b8bc2d6265e1bf01dd7b2c96ebf566 100644 (file)
--- a/target/linux/mediatek/filogic/config-6.12
+++ b/target/linux/mediatek/filogic/config-6.12
@@ -340,7 +340,6 @@ CONFIG_NVMEM_LAYOUT_ADTRAN=y
 CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_MTK_EFUSE=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_DYNAMIC=y

diff --git a/target/linux/mvebu/cortexa72/config-6.12 b/target/linux/mvebu/cortexa72/config-6.12
index eb53d98e5cb347bd46e6a02e83f470f5c0862272..4080fe278ad8dda4201802d772079d850dba8a6f 100644 (file)
--- a/target/linux/mvebu/cortexa72/config-6.12
+++ b/target/linux/mvebu/cortexa72/config-6.12
@@ -79,8 +79,8 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NVMEM_LAYOUTS=y
 CONFIG_NVMEM_LAYOUT_MIKROTIK=y
 CONFIG_NVMEM_LAYOUT_ONIE_TLV=y
+CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_PARTITION_PERCPU=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEPORTBUS=y

diff --git a/target/linux/qualcommax/config-6.12 b/target/linux/qualcommax/config-6.12
index 5ce1483c769d0738dabf0d46074c13eb5651adbf..40f2f3172c3b21215656ede05a95329c74a7bf83 100644 (file)
--- a/target/linux/qualcommax/config-6.12
+++ b/target/linux/qualcommax/config-6.12
@@ -299,7 +299,6 @@ CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y

diff --git a/target/linux/qualcommbe/config-6.12 b/target/linux/qualcommbe/config-6.12
index a6507ac85855ef100ed012ac81b692234729a622..360b2abd3ccffb1c5bb0e4962bf173e94262067e 100644 (file)
--- a/target/linux/qualcommbe/config-6.12
+++ b/target/linux/qualcommbe/config-6.12
@@ -299,7 +299,6 @@ CONFIG_NVMEM_LAYOUT_U_BOOT_ENV=y
 CONFIG_NVMEM_QCOM_QFPROM=y
 # CONFIG_NVMEM_QCOM_SEC_QFPROM is not set
 CONFIG_NVMEM_SYSFS=y
-CONFIG_NVMEM_U_BOOT_ENV=y
 CONFIG_OF=y
 CONFIG_OF_ADDRESS=y
 CONFIG_OF_EARLY_FLATTREE=y