crypto: Kconfig - sort the arm entries

Sort the arm 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/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig
index 98b680d..d73d199 100644 (file)
--- a/arch/arm/crypto/Kconfig
+++ b/arch/arm/crypto/Kconfig
@@ -2,6 +2,53 @@
 
 menu "Accelerated Cryptographic Algorithms for CPU (arm)"
 
+config CRYPTO_CURVE25519_NEON
+       tristate "NEON accelerated Curve25519 scalar multiplication library"
+       depends on KERNEL_MODE_NEON
+       select CRYPTO_LIB_CURVE25519_GENERIC
+       select CRYPTO_ARCH_HAVE_LIB_CURVE25519
+
+config CRYPTO_GHASH_ARM_CE
+       tristate "PMULL-accelerated GHASH using NEON/ARMv8 Crypto Extensions"
+       depends on KERNEL_MODE_NEON
+       select CRYPTO_HASH
+       select CRYPTO_CRYPTD
+       select CRYPTO_GF128MUL
+       help
+         Use an implementation of GHASH (used by the GCM AEAD chaining mode)
+         that uses the 64x64 to 128 bit polynomial multiplication (vmull.p64)
+         that is part of the ARMv8 Crypto Extensions, or a slower variant that
+         uses the vmull.p8 instruction that is part of the basic NEON ISA.
+
+config CRYPTO_NHPOLY1305_NEON
+       tristate "NEON accelerated NHPoly1305 hash function (for Adiantum)"
+       depends on KERNEL_MODE_NEON
+       select CRYPTO_NHPOLY1305
+
+config CRYPTO_POLY1305_ARM
+       tristate "Accelerated scalar and SIMD Poly1305 hash implementations"
+       select CRYPTO_HASH
+       select CRYPTO_ARCH_HAVE_LIB_POLY1305
+
+config CRYPTO_BLAKE2S_ARM
+       bool "BLAKE2s digest algorithm (ARM)"
+       select CRYPTO_ARCH_HAVE_LIB_BLAKE2S
+       help
+         BLAKE2s digest algorithm optimized with ARM scalar instructions.  This
+         is faster than the generic implementations of BLAKE2s and BLAKE2b, but
+         slower than the NEON implementation of BLAKE2b.  (There is no NEON
+         implementation of BLAKE2s, since NEON doesn't really help with it.)
+
+config CRYPTO_BLAKE2B_NEON
+       tristate "BLAKE2b digest algorithm (ARM NEON)"
+       depends on KERNEL_MODE_NEON
+       select CRYPTO_BLAKE2B
+       help
+         BLAKE2b digest algorithm optimized with ARM NEON instructions.
+         On ARM processors that have NEON support but not the ARMv8
+         Crypto Extensions, typically this BLAKE2b implementation is
+         much faster than SHA-2 and slightly faster than SHA-1.
+
 config CRYPTO_SHA1_ARM
        tristate "SHA1 digest algorithm (ARM-asm)"
        select CRYPTO_SHA1
@@ -55,25 +102,6 @@ config CRYPTO_SHA512_ARM
          SHA-512 secure hash standard (DFIPS 180-2) implemented
          using optimized ARM assembler and NEON, when available.
 
-config CRYPTO_BLAKE2S_ARM
-       bool "BLAKE2s digest algorithm (ARM)"
-       select CRYPTO_ARCH_HAVE_LIB_BLAKE2S
-       help
-         BLAKE2s digest algorithm optimized with ARM scalar instructions.  This
-         is faster than the generic implementations of BLAKE2s and BLAKE2b, but
-         slower than the NEON implementation of BLAKE2b.  (There is no NEON
-         implementation of BLAKE2s, since NEON doesn't really help with it.)
-
-config CRYPTO_BLAKE2B_NEON
-       tristate "BLAKE2b digest algorithm (ARM NEON)"
-       depends on KERNEL_MODE_NEON
-       select CRYPTO_BLAKE2B
-       help
-         BLAKE2b digest algorithm optimized with ARM NEON instructions.
-         On ARM processors that have NEON support but not the ARMv8
-         Crypto Extensions, typically this BLAKE2b implementation is
-         much faster than SHA-2 and slightly faster than SHA-1.
-
 config CRYPTO_AES_ARM
        tristate "Scalar AES cipher for ARM"
        select CRYPTO_ALGAPI
@@ -118,49 +146,22 @@ config CRYPTO_AES_ARM_CE
          Use an implementation of AES in CBC, CTR and XTS modes that uses
          ARMv8 Crypto Extensions
 
-config CRYPTO_GHASH_ARM_CE
-       tristate "PMULL-accelerated GHASH using NEON/ARMv8 Crypto Extensions"
-       depends on KERNEL_MODE_NEON
-       select CRYPTO_HASH
-       select CRYPTO_CRYPTD
-       select CRYPTO_GF128MUL
-       help
-         Use an implementation of GHASH (used by the GCM AEAD chaining mode)
-         that uses the 64x64 to 128 bit polynomial multiplication (vmull.p64)
-         that is part of the ARMv8 Crypto Extensions, or a slower variant that
-         uses the vmull.p8 instruction that is part of the basic NEON ISA.
-
-config CRYPTO_CRCT10DIF_ARM_CE
-       tristate "CRCT10DIF digest algorithm using PMULL instructions"
-       depends on KERNEL_MODE_NEON
-       depends on CRC_T10DIF
-       select CRYPTO_HASH
-
-config CRYPTO_CRC32_ARM_CE
-       tristate "CRC32(C) digest algorithm using CRC and/or PMULL instructions"
-       depends on KERNEL_MODE_NEON
-       depends on CRC32
-       select CRYPTO_HASH
-
 config CRYPTO_CHACHA20_NEON
        tristate "NEON and scalar accelerated ChaCha stream cipher algorithms"
        select CRYPTO_SKCIPHER
        select CRYPTO_ARCH_HAVE_LIB_CHACHA
 
-config CRYPTO_POLY1305_ARM
-       tristate "Accelerated scalar and SIMD Poly1305 hash implementations"
-       select CRYPTO_HASH
-       select CRYPTO_ARCH_HAVE_LIB_POLY1305
-
-config CRYPTO_NHPOLY1305_NEON
-       tristate "NEON accelerated NHPoly1305 hash function (for Adiantum)"
+config CRYPTO_CRC32_ARM_CE
+       tristate "CRC32(C) digest algorithm using CRC and/or PMULL instructions"
        depends on KERNEL_MODE_NEON
-       select CRYPTO_NHPOLY1305
+       depends on CRC32
+       select CRYPTO_HASH
 
-config CRYPTO_CURVE25519_NEON
-       tristate "NEON accelerated Curve25519 scalar multiplication library"
+config CRYPTO_CRCT10DIF_ARM_CE
+       tristate "CRCT10DIF digest algorithm using PMULL instructions"
        depends on KERNEL_MODE_NEON
-       select CRYPTO_LIB_CURVE25519_GENERIC
-       select CRYPTO_ARCH_HAVE_LIB_CURVE25519
+       depends on CRC_T10DIF
+       select CRYPTO_HASH
 
 endmenu
+