crypto: x86 - rework configuration based on Kconfig

[mirror_ubuntu-hirsute-kernel.git] / crypto / Kconfig

diff --git a/crypto/Kconfig b/crypto/Kconfig
index c24a47406f8f57b7550a98a20654fde836d212d0..49aae167e75c1d0f8e4bfd69e3aa7ca7ab0ed6af 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -267,7 +267,7 @@ config CRYPTO_CURVE25519
 
 config CRYPTO_CURVE25519_X86
        tristate "x86_64 accelerated Curve25519 scalar multiplication library"
-       depends on X86 && 64BIT
+       depends on X86 && 64BIT && AS_ADX
        select CRYPTO_LIB_CURVE25519_GENERIC
        select CRYPTO_ARCH_HAVE_LIB_CURVE25519
 
@@ -465,7 +465,7 @@ config CRYPTO_NHPOLY1305_SSE2
 
 config CRYPTO_NHPOLY1305_AVX2
        tristate "NHPoly1305 hash function (x86_64 AVX2 implementation)"
-       depends on X86 && 64BIT
+       depends on X86 && 64BIT && AS_AVX2
        select CRYPTO_NHPOLY1305
        help
          AVX2 optimized implementation of the hash function used by the
@@ -1303,7 +1303,7 @@ config CRYPTO_CAMELLIA_AESNI_AVX_X86_64
 
 config CRYPTO_CAMELLIA_AESNI_AVX2_X86_64
        tristate "Camellia cipher algorithm (x86_64/AES-NI/AVX2)"
-       depends on X86 && 64BIT
+       depends on X86 && 64BIT && AS_AVX2
        depends on CRYPTO
        select CRYPTO_CAMELLIA_AESNI_AVX_X86_64
        help
@@ -1573,7 +1573,7 @@ config CRYPTO_SERPENT_AVX_X86_64
 
 config CRYPTO_SERPENT_AVX2_X86_64
        tristate "Serpent cipher algorithm (x86_64/AVX2)"
-       depends on X86 && 64BIT
+       depends on X86 && 64BIT && AS_AVX2
        select CRYPTO_SERPENT_AVX_X86_64
        help
          Serpent cipher algorithm, by Anderson, Biham & Knudsen.