crypto: Kconfig - sort the arm64 entries

Sort the arm64 entries so all like entries are together.

Signed-off-by: Robert Elliott <elliott@hpe.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig
index 536511a..c5d42f6 100644 (file)
--- a/arch/arm64/crypto/Kconfig
+++ b/arch/arm64/crypto/Kconfig
@@ -2,13 +2,24 @@
 
 menu "Accelerated Cryptographic Algorithms for CPU (arm64)"
 
-config CRYPTO_SHA256_ARM64
-       tristate "SHA-224/SHA-256 digest algorithm for arm64"
+config CRYPTO_GHASH_ARM64_CE
+       tristate "GHASH/AES-GCM using ARMv8 Crypto Extensions"
+       depends on KERNEL_MODE_NEON
        select CRYPTO_HASH
+       select CRYPTO_GF128MUL
+       select CRYPTO_LIB_AES
+       select CRYPTO_AEAD
 
-config CRYPTO_SHA512_ARM64
-       tristate "SHA-384/SHA-512 digest algorithm for arm64"
+config CRYPTO_NHPOLY1305_NEON
+       tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)"
+       depends on KERNEL_MODE_NEON
+       select CRYPTO_NHPOLY1305
+
+config CRYPTO_POLY1305_NEON
+       tristate "Poly1305 hash function using scalar or NEON instructions"
+       depends on KERNEL_MODE_NEON
        select CRYPTO_HASH
+       select CRYPTO_ARCH_HAVE_LIB_POLY1305
 
 config CRYPTO_SHA1_ARM64_CE
        tristate "SHA-1 digest algorithm (ARMv8 Crypto Extensions)"
@@ -16,12 +27,20 @@ config CRYPTO_SHA1_ARM64_CE
        select CRYPTO_HASH
        select CRYPTO_SHA1
 
+config CRYPTO_SHA256_ARM64
+       tristate "SHA-224/SHA-256 digest algorithm for arm64"
+       select CRYPTO_HASH
+
 config CRYPTO_SHA2_ARM64_CE
        tristate "SHA-224/SHA-256 digest algorithm (ARMv8 Crypto Extensions)"
        depends on KERNEL_MODE_NEON
        select CRYPTO_HASH
        select CRYPTO_SHA256_ARM64
 
+config CRYPTO_SHA512_ARM64
+       tristate "SHA-384/SHA-512 digest algorithm for arm64"
+       select CRYPTO_HASH
+
 config CRYPTO_SHA512_ARM64_CE
        tristate "SHA-384/SHA-512 digest algorithm (ARMv8 Crypto Extensions)"
        depends on KERNEL_MODE_NEON
@@ -40,42 +59,11 @@ config CRYPTO_SM3_ARM64_CE
        select CRYPTO_HASH
        select CRYPTO_SM3
 
-config CRYPTO_SM4_ARM64_CE
-       tristate "SM4 symmetric cipher (ARMv8.2 Crypto Extensions)"
-       depends on KERNEL_MODE_NEON
-       select CRYPTO_ALGAPI
-       select CRYPTO_SM4
-
-config CRYPTO_SM4_ARM64_CE_BLK
-       tristate "SM4 in ECB/CBC/CFB/CTR modes using ARMv8 Crypto Extensions"
-       depends on KERNEL_MODE_NEON
-       select CRYPTO_SKCIPHER
-       select CRYPTO_SM4
-
-config CRYPTO_SM4_ARM64_NEON_BLK
-       tristate "SM4 in ECB/CBC/CFB/CTR modes using NEON instructions"
-       depends on KERNEL_MODE_NEON
-       select CRYPTO_SKCIPHER
-       select CRYPTO_SM4
-
-config CRYPTO_GHASH_ARM64_CE
-       tristate "GHASH/AES-GCM using ARMv8 Crypto Extensions"
-       depends on KERNEL_MODE_NEON
-       select CRYPTO_HASH
-       select CRYPTO_GF128MUL
-       select CRYPTO_LIB_AES
-       select CRYPTO_AEAD
-
 config CRYPTO_POLYVAL_ARM64_CE
        tristate "POLYVAL using ARMv8 Crypto Extensions (for HCTR2)"
        depends on KERNEL_MODE_NEON
        select CRYPTO_POLYVAL
 
-config CRYPTO_CRCT10DIF_ARM64_CE
-       tristate "CRCT10DIF digest algorithm using PMULL instructions"
-       depends on KERNEL_MODE_NEON && CRC_T10DIF
-       select CRYPTO_HASH
-
 config CRYPTO_AES_ARM64
        tristate "AES core cipher using scalar instructions"
        select CRYPTO_AES
@@ -86,14 +74,6 @@ config CRYPTO_AES_ARM64_CE
        select CRYPTO_ALGAPI
        select CRYPTO_LIB_AES
 
-config CRYPTO_AES_ARM64_CE_CCM
-       tristate "AES in CCM mode using ARMv8 Crypto Extensions"
-       depends on ARM64 && KERNEL_MODE_NEON
-       select CRYPTO_ALGAPI
-       select CRYPTO_AES_ARM64_CE
-       select CRYPTO_AEAD
-       select CRYPTO_LIB_AES
-
 config CRYPTO_AES_ARM64_CE_BLK
        tristate "AES in ECB/CBC/CTR/XTS/XCTR modes using ARMv8 Crypto Extensions"
        depends on KERNEL_MODE_NEON
@@ -113,22 +93,43 @@ config CRYPTO_CHACHA20_NEON
        select CRYPTO_LIB_CHACHA_GENERIC
        select CRYPTO_ARCH_HAVE_LIB_CHACHA
 
-config CRYPTO_POLY1305_NEON
-       tristate "Poly1305 hash function using scalar or NEON instructions"
+config CRYPTO_AES_ARM64_BS
+       tristate "AES in ECB/CBC/CTR/XTS modes using bit-sliced NEON algorithm"
        depends on KERNEL_MODE_NEON
-       select CRYPTO_HASH
-       select CRYPTO_ARCH_HAVE_LIB_POLY1305
+       select CRYPTO_SKCIPHER
+       select CRYPTO_AES_ARM64_NEON_BLK
+       select CRYPTO_LIB_AES
 
-config CRYPTO_NHPOLY1305_NEON
-       tristate "NHPoly1305 hash function using NEON instructions (for Adiantum)"
+config CRYPTO_SM4_ARM64_CE
+       tristate "SM4 symmetric cipher (ARMv8.2 Crypto Extensions)"
        depends on KERNEL_MODE_NEON
-       select CRYPTO_NHPOLY1305
+       select CRYPTO_ALGAPI
+       select CRYPTO_SM4
 
-config CRYPTO_AES_ARM64_BS
-       tristate "AES in ECB/CBC/CTR/XTS modes using bit-sliced NEON algorithm"
+config CRYPTO_SM4_ARM64_CE_BLK
+       tristate "SM4 in ECB/CBC/CFB/CTR modes using ARMv8 Crypto Extensions"
        depends on KERNEL_MODE_NEON
        select CRYPTO_SKCIPHER
-       select CRYPTO_AES_ARM64_NEON_BLK
+       select CRYPTO_SM4
+
+config CRYPTO_SM4_ARM64_NEON_BLK
+       tristate "SM4 in ECB/CBC/CFB/CTR modes using NEON instructions"
+       depends on KERNEL_MODE_NEON
+       select CRYPTO_SKCIPHER
+       select CRYPTO_SM4
+
+config CRYPTO_AES_ARM64_CE_CCM
+       tristate "AES in CCM mode using ARMv8 Crypto Extensions"
+       depends on ARM64 && KERNEL_MODE_NEON
+       select CRYPTO_ALGAPI
+       select CRYPTO_AES_ARM64_CE
+       select CRYPTO_AEAD
        select CRYPTO_LIB_AES
 
+config CRYPTO_CRCT10DIF_ARM64_CE
+       tristate "CRCT10DIF digest algorithm using PMULL instructions"
+       depends on KERNEL_MODE_NEON && CRC_T10DIF
+       select CRYPTO_HASH
+
 endmenu
+