aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-07-06 20:32:11 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-06 21:09:39 +0200
commitbfd070e7fa5ad715fb1a8f8449ab5d7750c59338 (patch)
treeabae55b10ae05d92b792c495319df4fbc398a002 /target
parent5c7aed8b1e7336686860479cc6f0716ca6bf7016 (diff)
downloadupstream-bfd070e7fa5ad715fb1a8f8449ab5d7750c59338.tar.gz
upstream-bfd070e7fa5ad715fb1a8f8449ab5d7750c59338.tar.bz2
upstream-bfd070e7fa5ad715fb1a8f8449ab5d7750c59338.zip
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. Fixes: 2bea35cb55d7 ("mediatek: remove crypto-hw-mtk package") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit dcc0fe24ea216d32300c0f01c8879e586d89cc1e)
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/config-5.103
-rw-r--r--target/linux/mediatek/mt7629/config-5.102
2 files changed, 3 insertions, 2 deletions
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index bb44c3404c..dac778e073 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
@@ -3194,6 +3195,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
@@ -3694,6 +3696,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/mediatek/mt7629/config-5.10 b/target/linux/mediatek/mt7629/config-5.10
index 8b16d8d6a6..dc92580f6e 100644
--- a/target/linux/mediatek/mt7629/config-5.10
+++ b/target/linux/mediatek/mt7629/config-5.10
@@ -159,7 +159,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
@@ -187,7 +186,6 @@ CONFIG_MTK_INFRACFG=y
# CONFIG_MTK_PMIC_WRAP is not set
CONFIG_MTK_SCPSYS=y
CONFIG_MTK_SPI_NAND=y
-# CONFIG_MTK_THERMAL is not set
CONFIG_MTK_TIMER=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y