diff options
| author | Shiji Yang | 2025-04-30 16:33:41 +0000 |
|---|---|---|
| committer | David Bauer | 2025-05-24 13:42:22 +0000 |
| commit | 87d25931772e773c77826edd0dc252011312dfcd (patch) | |
| tree | 36377f8214b8ec5ba6c91b9307c9ebe16c7dfbe8 | |
| parent | 515130e8f774c8b0aef363727fda8a837bbdf9d1 (diff) | |
| download | openwrt-87d25931772e773c77826edd0dc252011312dfcd.tar.gz | |
ath79: refresh kernel symbol configs
Manually move the common NVMEM Kconfig symbols to the shared
config file and disable them for the mikrotik subtarget. Other
changes are automatically completed by `make kernel_oldconfig`.
This is a preparation for introducing the 6.12 kernel support.
Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
| -rw-r--r-- | target/linux/ath79/config-6.6 | 3 | ||||
| -rw-r--r-- | target/linux/ath79/generic/config-default | 2 | ||||
| -rw-r--r-- | target/linux/ath79/mikrotik/config-default | 3 | ||||
| -rw-r--r-- | target/linux/ath79/nand/config-default | 1 | ||||
| -rw-r--r-- | target/linux/ath79/tiny/config-default | 5 |
5 files changed, 6 insertions, 8 deletions
diff --git a/target/linux/ath79/config-6.6 b/target/linux/ath79/config-6.6 index c43dbfd719..3efe718368 100644 --- a/target/linux/ath79/config-6.6 +++ b/target/linux/ath79/config-6.6 @@ -149,6 +149,9 @@ CONFIG_NET_XGRESS=y CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y 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/generic/config-default b/target/linux/ath79/generic/config-default index 1141d7ae47..6c7a087f3f 100644 --- a/target/linux/ath79/generic/config-default +++ b/target/linux/ath79/generic/config-default @@ -18,8 +18,6 @@ CONFIG_MTD_SPI_NOR_SWP_DISABLE=y # CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE is not set CONFIG_MTD_SPI_NOR_USE_VARIABLE_ERASE=y CONFIG_MTD_SPLIT_EVA_FW=y -CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y CONFIG_REALTEK_PHY=y CONFIG_REGMAP_I2C=y CONFIG_REGULATOR_FIXED_VOLTAGE=y diff --git a/target/linux/ath79/mikrotik/config-default b/target/linux/ath79/mikrotik/config-default index 735de06d55..57b697a13d 100644 --- a/target/linux/ath79/mikrotik/config-default +++ b/target/linux/ath79/mikrotik/config-default @@ -34,6 +34,9 @@ CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_NET_DEVLINK=y 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/ath79/nand/config-default b/target/linux/ath79/nand/config-default index bbe9673d70..71ce1caad7 100644 --- a/target/linux/ath79/nand/config-default +++ b/target/linux/ath79/nand/config-default @@ -17,7 +17,6 @@ CONFIG_MTD_UBI=y CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_MTD_UBI_BLOCK=y CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_NVMEM_U_BOOT_ENV=y # CONFIG_PCI_AR71XX is not set CONFIG_POWER_RESET=y CONFIG_POWER_RESET_GPIO_RESTART=y diff --git a/target/linux/ath79/tiny/config-default b/target/linux/ath79/tiny/config-default index 8aca93b54e..261bbb83fd 100644 --- a/target/linux/ath79/tiny/config-default +++ b/target/linux/ath79/tiny/config-default @@ -1,7 +1,2 @@ -CONFIG_GRO_CELLS=y CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y -CONFIG_NET_DEVLINK=y -CONFIG_NVMEM_SYSFS=y -CONFIG_NVMEM_U_BOOT_ENV=y -CONFIG_PHYLINK=y CONFIG_REGULATOR_FIXED_VOLTAGE=y |