Commit e346f9dd authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

m68k: defconfig: Update defconfigs for v6.5-rc1 



  - Drop CONFIG_CRYPTO_SHA3=m (auto-enabled since commit
    bb897c55 ("crypto: jitter - replace LFSR with SHA3-256")),
  - Enable modular build of the Maple Tree test, which can now be
    enabled when debugging is disabled.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/274736e1cf7ab863fe84400611c300cb5a25b8c8.1688985387.git.geert@linux-m68k.org
parent 922a9bd1

arch/m68k/configs/amiga_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -591,7 +591,6 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m
@@ -635,6 +634,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

arch/m68k/configs/apollo_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m
@@ -591,6 +590,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

arch/m68k/configs/atari_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m
@@ -612,6 +611,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

arch/m68k/configs/bvme6000_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,6 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m
@@ -583,6 +582,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m

arch/m68k/configs/hp300_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -550,7 +550,6 @@ CONFIG_CRYPTO_CHACHA20POLY1305=m 
CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3_GENERIC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_WP512=m
@@ -593,6 +592,7 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_MAPLE_TREE=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_IDA=m

CONFIG_TEST_BITOPS=m