Commit 382f429b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v5.8-rc3 



  - Re-enable modular build of DES crypto algorithm (no longer
    auto-enabled since commit be013698 ("esp, ah: modernize the
    crypto algorithm selections")),
  - Enable modular build of prime numbers and bitops test modules.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20200615075458.22088-1-geert@linux-m68k.org
Link: https://lore.kernel.org/r/20200706093456.15641-1-geert@linux-m68k.org
parent e3a54948

arch/m68k/configs/amiga_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -594,6 +594,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -615,6 +616,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m
@@ -643,6 +645,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

arch/m68k/configs/apollo_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -571,6 +572,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m
@@ -599,6 +601,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

arch/m68k/configs/atari_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -593,6 +594,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m
@@ -621,6 +623,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

arch/m68k/configs/bvme6000_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -543,6 +543,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -564,6 +565,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m
@@ -592,6 +594,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

arch/m68k/configs/hp300_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -552,6 +552,7 @@ CONFIG_CRYPTO_BLOWFISH=m 
CONFIG_CRYPTO_CAMELLIA=m

CONFIG_CRYPTO_CAST5=m

CONFIG_CRYPTO_CAST6=m

CONFIG_CRYPTO_DES=m

CONFIG_CRYPTO_FCRYPT=m

CONFIG_CRYPTO_KHAZAD=m

CONFIG_CRYPTO_SALSA20=m
@@ -573,6 +574,7 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m 
CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

# CONFIG_CRYPTO_HW is not set

CONFIG_PRIME_NUMBERS=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_XZ_DEC_TEST=m
@@ -601,6 +603,7 @@ CONFIG_TEST_OVERFLOW=m 
CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_HASH=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

CONFIG_TEST_VMALLOC=m

CONFIG_TEST_USER_COPY=m

CONFIG_TEST_BPF=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE