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

m68k: defconfig: Update defconfigs for v5.18-rc1 



  - Drop CONFIG_BINFMT_AOUT=m (no longer available since commit
    19e8b701 ("a.out: Stop building a.out/osf1 support on alpha
    and m68k")),
  - Enable modular build of the SM3 digest algorithm (no longer
    auto-selected since commit 11400469 ("crypto: sm2 - make
    dependent on sm3 library")),
  - Drop CONFIG_CRC64=m (auto-selected since commit a7d4383f
    ("block: add pi for extended integrity")),
  - Drop CONFIG_TEST_OVERFLOW=m (replaced by auto-modular
    CONFIG_OVERFLOW_KUNIT_TEST in commit 617f55e2 ("lib:
    overflow: Convert to Kunit")),
  - Drop CONFIG_TEST_STACKINIT=m (replaced by auto-modular
    CONFIG_STACKINIT_KUNIT_TEST in commit 02788ebc ("lib:
    stackinit: Convert to KUnit")).

Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/2ca38d8de70fc9fad5ad17fb81d04736effa181d.1649066720.git.geert@linux-m68k.org
parent 05d51e42

arch/m68k/configs/amiga_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m
@@ -581,6 +580,7 @@ CONFIG_CRYPTO_MD4=m 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -613,7 +613,6 @@ 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

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -638,7 +637,6 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m
@@ -659,6 +657,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_TEST_FREE_PAGES=m

arch/m68k/configs/apollo_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m
@@ -538,6 +537,7 @@ CONFIG_CRYPTO_MD4=m 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -570,7 +570,6 @@ 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

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y
@@ -594,7 +593,6 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m
@@ -615,6 +613,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_TEST_FREE_PAGES=m

arch/m68k/configs/atari_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m
@@ -558,6 +557,7 @@ CONFIG_CRYPTO_MD4=m 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -590,7 +590,6 @@ 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

CONFIG_GLOB_SELFTEST=m

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
@@ -615,7 +614,6 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m
@@ -636,6 +634,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_TEST_FREE_PAGES=m

arch/m68k/configs/bvme6000_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m
@@ -530,6 +529,7 @@ CONFIG_CRYPTO_MD4=m 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -562,7 +562,6 @@ 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

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y
@@ -586,7 +585,6 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m
@@ -607,6 +605,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_TEST_FREE_PAGES=m

arch/m68k/configs/hp300_defconfig

+1 −4
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ CONFIG_MQ_IOSCHED_DEADLINE=m 
CONFIG_MQ_IOSCHED_KYBER=m

CONFIG_IOSCHED_BFQ=m

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_BINFMT_AOUT=m

CONFIG_BINFMT_MISC=m

# CONFIG_COMPACTION is not set

CONFIG_ZPOOL=m
@@ -540,6 +539,7 @@ CONFIG_CRYPTO_MD4=m 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES=y

CONFIG_CRYPTO_AES_TI=m
@@ -572,7 +572,6 @@ 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

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_MAGIC_SYSRQ=y
@@ -596,7 +595,6 @@ CONFIG_TEST_SCANF=m 
CONFIG_TEST_BITMAP=m

CONFIG_TEST_UUID=m

CONFIG_TEST_XARRAY=m

CONFIG_TEST_OVERFLOW=m

CONFIG_TEST_RHASHTABLE=m

CONFIG_TEST_SIPHASH=m

CONFIG_TEST_IDA=m
@@ -617,6 +615,5 @@ CONFIG_TEST_UDELAY=m 
CONFIG_TEST_STATIC_KEYS=m

CONFIG_TEST_KMOD=m

CONFIG_TEST_MEMCAT_P=m

CONFIG_TEST_STACKINIT=m

CONFIG_TEST_MEMINIT=m

CONFIG_TEST_FREE_PAGES=m