aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu
diff options
context:
space:
mode:
authorSergey Ryazanov <ryazanov.s.a@gmail.com>2021-12-17 01:23:08 +0300
committerHauke Mehrtens <hauke@hauke-m.de>2021-12-17 16:16:34 +0100
commitfa3690f8f14fad591fe7896c2dccaa3d06b857e5 (patch)
tree86f1b3729a4f3ab8cd68cb1bf43c56e7d5440893 /target/linux/mvebu
parentb61ab8f57e3f2877d75c7336980f651e638e3dad (diff)
downloadupstream-fa3690f8f14fad591fe7896c2dccaa3d06b857e5.tar.gz
upstream-fa3690f8f14fad591fe7896c2dccaa3d06b857e5.tar.bz2
upstream-fa3690f8f14fad591fe7896c2dccaa3d06b857e5.zip
kernel: 5.10: consolidate mac80211 crypto options
Each of - CRYPTO_AEAD2 - CRYPTO_AEAD - CRYPTO_GF128MUL - CRYPTO_GHASH - CRYPTO_HASH2 - CRYPTO_HASH - CRYPTO_MANAGER2 - CRYPTO_MANAGER - CRYPTO_NULL2 either directly required for mac80211 crypto support, or directly selected by such options. Support for the mac80211 crypto was enabled in the generic config since c7182123b9 ("kernel: make cryptoapi support needed by mac80211 built-in"). So move the above options from the target configs to the generic config to make it clear why do we need them. CC: Felix Fietkau <nbd@nbd.name> Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Diffstat (limited to 'target/linux/mvebu')
-rw-r--r--target/linux/mvebu/config-5.107
-rw-r--r--target/linux/mvebu/cortexa72/config-5.101
2 files changed, 0 insertions, 8 deletions
diff --git a/target/linux/mvebu/config-5.10 b/target/linux/mvebu/config-5.10
index 1aaacd0bb3..1017ee5eed 100644
--- a/target/linux/mvebu/config-5.10
+++ b/target/linux/mvebu/config-5.10
@@ -100,8 +100,6 @@ CONFIG_CPU_TLB_V7=y
CONFIG_CPU_V7=y
CONFIG_CRC16=y
CONFIG_CRYPTO_ACOMP2=y
-CONFIG_CRYPTO_AEAD=y
-CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AES_ARM=y
CONFIG_CRYPTO_AES_ARM_BS=y
CONFIG_CRYPTO_AUTHENC=y
@@ -113,16 +111,11 @@ CONFIG_CRYPTO_DES=y
CONFIG_CRYPTO_DEV_MARVELL=y
CONFIG_CRYPTO_DEV_MARVELL_CESA=y
CONFIG_CRYPTO_ESSIV=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_CRYPTO_LIB_DES=y
CONFIG_CRYPTO_LZO=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_NULL=y
-CONFIG_CRYPTO_NULL2=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA1_ARM=y
diff --git a/target/linux/mvebu/cortexa72/config-5.10 b/target/linux/mvebu/cortexa72/config-5.10
index 68443a85e5..421b732ded 100644
--- a/target/linux/mvebu/cortexa72/config-5.10
+++ b/target/linux/mvebu/cortexa72/config-5.10
@@ -30,7 +30,6 @@ CONFIG_ARM_GIC_V3_ITS_PCI=y
CONFIG_ARM_PSCI_FW=y
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_CRYPTO_GF128MUL=y
CONFIG_CRYPTO_ZSTD=y
CONFIG_DMA_DIRECT_REMAP=y
# CONFIG_FLATMEM_MANUAL is not set