diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2022-04-04 13:11:46 +0300 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2022-04-25 15:15:02 +0300 |
| commit | a96e4ebf3dedaf110999189939cd0272d32c4296 (patch) | |
| tree | 9728db52d24be9cc15fa3165ed05450c3463c970 /arch/m68k/configs/multi_defconfig | |
| parent | 05d51e42df06f0211c7029ab9aa46c492ee85043 (diff) | |
| download | linux-a96e4ebf3dedaf110999189939cd0272d32c4296.tar.xz | |
m68k: defconfig: Update defconfigs for v5.18-rc1
- Drop CONFIG_BINFMT_AOUT=m (no longer available since commit
19e8b701e258701b ("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 114004696bf23499 ("crypto: sm2 - make
dependent on sm3 library")),
- Drop CONFIG_CRC64=m (auto-selected since commit a7d4383f17e10f33
("block: add pi for extended integrity")),
- Drop CONFIG_TEST_OVERFLOW=m (replaced by auto-modular
CONFIG_OVERFLOW_KUNIT_TEST in commit 617f55e20743fc50 ("lib:
overflow: Convert to Kunit")),
- Drop CONFIG_TEST_STACKINIT=m (replaced by auto-modular
CONFIG_STACKINIT_KUNIT_TEST in commit 02788ebcf521fe78 ("lib:
stackinit: Convert to KUnit")).
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/2ca38d8de70fc9fad5ad17fb81d04736effa181d.1649066720.git.geert@linux-m68k.org
Diffstat (limited to 'arch/m68k/configs/multi_defconfig')
| -rw-r--r-- | arch/m68k/configs/multi_defconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 2fc3f0df6d43..6aaa947bc849 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -56,7 +56,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 @@ -646,6 +645,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 @@ -678,7 +678,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 @@ -703,7 +702,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 @@ -724,6 +722,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 |