[openwrt/openwrt] kernel: Add missing mediatek configuration options

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/dcc0fe24ea216d32300c0f01c8879e586d89cc1e

commit dcc0fe24ea216d32300c0f01c8879e586d89cc1e
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Wed Jul 6 20:32:11 2022 +0200

    kernel: Add missing mediatek configuration options
    
    When building the mediatek/mt7629 target in OpenWrt 22.03 the kernel
    does not have a configuration option for CONFIG_CRYPTO_DEV_MEDIATEK. Add
    this option to the generic kernel configuration and also add two other
    configuration options which are removed when we refresh the mt7629
    kernel configuration.
    
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 target/linux/generic/config-5.10         | 3 +++
 target/linux/generic/config-5.15         | 3 +++
 target/linux/mediatek/mt7629/config-5.15 | 2 --
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 2758479519..c14851dbdb 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -1099,6 +1099,7 @@ CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_DEV_HISI_ZIP is not set
 # CONFIG_CRYPTO_DEV_IMGTEC_HASH is not set
 # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
+# CONFIG_CRYPTO_DEV_MEDIATEK is not set
 # CONFIG_CRYPTO_DEV_MV_CESA is not set
 # CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
@@ -3202,6 +3203,7 @@ CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MDIO_XPCS is not set
 # CONFIG_MD_FAULTY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
+# CONFIG_MEDIATEK_MT6577_AUXADC is not set
 # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
 # CONFIG_MEDIA_ATTACH is not set
 # CONFIG_MEDIA_CAMERA_SUPPORT is not set
@@ -3701,6 +3703,7 @@ CONFIG_MTD_SPLIT_SUPPORT=y
 # CONFIG_MTD_VIRT_CONCAT is not set
 # CONFIG_MTK_MMC is not set
 # CONFIG_MTK_MMSYS is not set
+# CONFIG_MTK_THERMAL is not set
 # CONFIG_MULTIPLEXER is not set
 CONFIG_MULTIUSER=y
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index bd21e99356..cb71d9642b 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -1129,6 +1129,7 @@ CONFIG_CRYPTO_CTR=y
 # CONFIG_CRYPTO_DEV_HISI_ZIP is not set
 # CONFIG_CRYPTO_DEV_IMGTEC_HASH is not set
 # CONFIG_CRYPTO_DEV_MARVELL_CESA is not set
+# CONFIG_CRYPTO_DEV_MEDIATEK is not set
 # CONFIG_CRYPTO_DEV_MV_CESA is not set
 # CONFIG_CRYPTO_DEV_MXC_SCC is not set
 # CONFIG_CRYPTO_DEV_MXS_DCP is not set
@@ -3307,6 +3308,7 @@ CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_MDM_GCC_9607 is not set
 # CONFIG_MD_FAULTY is not set
 # CONFIG_MEDIATEK_GE_PHY is not set
+# CONFIG_MEDIATEK_MT6577_AUXADC is not set
 # CONFIG_MEDIA_ANALOG_TV_SUPPORT is not set
 # CONFIG_MEDIA_ATTACH is not set
 # CONFIG_MEDIA_CAMERA_SUPPORT is not set
@@ -3845,6 +3847,7 @@ CONFIG_MTD_SPLIT_SUPPORT=y
 # CONFIG_MTK_DEVAPC is not set
 # CONFIG_MTK_MMC is not set
 # CONFIG_MTK_MMSYS is not set
+# CONFIG_MTK_THERMAL is not set
 # CONFIG_MULTIPLEXER is not set
 CONFIG_MULTIUSER=y
 # CONFIG_MUTEX_SPIN_ON_OWNER is not set
diff --git a/target/linux/mediatek/mt7629/config-5.15 b/target/linux/mediatek/mt7629/config-5.15
index 41c7032f58..24b7d3a154 100644
--- a/target/linux/mediatek/mt7629/config-5.15
+++ b/target/linux/mediatek/mt7629/config-5.15
@@ -165,7 +165,6 @@ CONFIG_MACH_MT7629=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_DEVRES=y
-# CONFIG_MEDIATEK_MT6577_AUXADC is not set
 CONFIG_MEDIATEK_WATCHDOG=y
 CONFIG_MEMFD_CREATE=y
 CONFIG_MFD_SYSCON=y
@@ -192,7 +191,6 @@ CONFIG_MTK_INFRACFG=y
 # CONFIG_MTK_PMIC_WRAP is not set
 CONFIG_MTK_SCPSYS=y
 CONFIG_MTK_SCPSYS_PM_DOMAINS=y
-# CONFIG_MTK_THERMAL is not set
 CONFIG_MTK_TIMER=y
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y