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

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



  - Enable modular build of new crypto algorithms:
      - CONFIG_CRYPTO_BLAKE2S=m,
      - CONFIG_CRYPTO_CURVE25519=m,
      - CONFIG_CRYPTO_LIB_BLAKE2S=m,
      - CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m,
      - CONFIG_CRYPTO_LIB_CURVE25519=m.
  - Remove CONFIG_CRYPTO_XXHASH=m (auto-selected by CONFIG_BTRFS_FS
    since commit 3951e7f0 ("btrfs: add xxhash64 to checksumming
    algorithms"),
  - Move CONFIG_EARLY_PRINTK.

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent e8bb2a2a

arch/m68k/configs/amiga_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -562,6 +562,7 @@ CONFIG_CRYPTO_RSA=m 
CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CFB=m
@@ -574,7 +575,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD160=m
@@ -612,6 +613,9 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_CRC64=m
@@ -620,6 +624,7 @@ CONFIG_STRING_SELFTEST=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_REED_SOLOMON_TEST=m
@@ -651,4 +656,3 @@ CONFIG_TEST_KMOD=m 
CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m
 
CONFIG_TEST_MEMINIT=m
 
CONFIG_EARLY_PRINTK=y

arch/m68k/configs/apollo_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -518,6 +518,7 @@ CONFIG_CRYPTO_RSA=m 
CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CFB=m
@@ -530,7 +531,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD160=m
@@ -568,6 +569,9 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_CRC64=m
@@ -576,6 +580,7 @@ CONFIG_STRING_SELFTEST=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_REED_SOLOMON_TEST=m
@@ -607,4 +612,3 @@ CONFIG_TEST_KMOD=m 
CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m
 
CONFIG_TEST_MEMINIT=m
 
CONFIG_EARLY_PRINTK=y

arch/m68k/configs/atari_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -540,6 +540,7 @@ CONFIG_CRYPTO_RSA=m 
CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CFB=m
@@ -552,7 +553,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD160=m
@@ -590,6 +591,9 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_CRC64=m
@@ -598,6 +602,7 @@ CONFIG_STRING_SELFTEST=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_REED_SOLOMON_TEST=m
@@ -629,4 +634,3 @@ CONFIG_TEST_KMOD=m 
CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m
 
CONFIG_TEST_MEMINIT=m
 
CONFIG_EARLY_PRINTK=y

arch/m68k/configs/bvme6000_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -511,6 +511,7 @@ CONFIG_CRYPTO_RSA=m 
CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CFB=m
@@ -523,7 +524,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD160=m
@@ -561,6 +562,9 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_CRC64=m
@@ -569,6 +573,7 @@ CONFIG_STRING_SELFTEST=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_REED_SOLOMON_TEST=m
@@ -600,4 +605,3 @@ CONFIG_TEST_KMOD=m 
CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m
 
CONFIG_TEST_MEMINIT=m
 
CONFIG_EARLY_PRINTK=y

arch/m68k/configs/hp300_defconfig

+6 −2
Original line number Original line Diff line number Diff line
@@ -520,6 +520,7 @@ CONFIG_CRYPTO_RSA=m 
CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_DH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECDH=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_ECRDSA=m

CONFIG_CRYPTO_CURVE25519=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_CHACHA20POLY1305=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_AEGIS128=m

CONFIG_CRYPTO_CFB=m

CONFIG_CRYPTO_CFB=m
@@ -532,7 +533,7 @@ CONFIG_CRYPTO_KEYWRAP=m 
CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_ADIANTUM=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_XCBC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_VMAC=m

CONFIG_CRYPTO_XXHASH=m

CONFIG_CRYPTO_BLAKE2S=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD128=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_RMD160=m
@@ -570,6 +571,9 @@ CONFIG_CRYPTO_USER_API_HASH=m 
CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_SKCIPHER=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_RNG=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_USER_API_AEAD=m

CONFIG_CRYPTO_LIB_BLAKE2S=m

CONFIG_CRYPTO_LIB_CURVE25519=m

CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m

# CONFIG_CRYPTO_HW is not set

# CONFIG_CRYPTO_HW is not set

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC32_SELFTEST=m

CONFIG_CRC64=m

CONFIG_CRC64=m
@@ -578,6 +582,7 @@ CONFIG_STRING_SELFTEST=m 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_WW_MUTEX_SELFTEST=m

CONFIG_EARLY_PRINTK=y

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_LIST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_TEST_SORT=m

CONFIG_REED_SOLOMON_TEST=m

CONFIG_REED_SOLOMON_TEST=m
@@ -609,4 +614,3 @@ CONFIG_TEST_KMOD=m 
CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m
 
CONFIG_TEST_MEMINIT=m
 
CONFIG_EARLY_PRINTK=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE