Skip to content

Commit 7e02d70

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v6.6-rc1
 - Enable modular build of the new device model tests, - Enable modular build of the glob self-test on configs that didn't have it yet (visible since commit b67abaa ("kunit: Allow kunit test modules to use test filtering")), - Replace CONFIG_FB=y by CONFIG_FRAMEBUFFER_CONSOLE=y on the virt platform (the former is no longer needed since commit 55bffc8 ("fbdev: Split frame buffer support in FB and FB_CORE symbols")), the latter is no longer auto-enabled since commit a5ae331 ("drm: Drop select FRAMEBUFFER_CONSOLE for DRM_FBDEV_EMULATION")). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/43ef623c9053862d93fbc746689d4897b35597ef.1694442486.git.geert@linux-m68k.org
1 parent c7db383 commit 7e02d70

13 files changed

Lines changed: 20 additions & 1 deletion

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,7 @@ CONFIG_NET_IFE=m
299299
CONFIG_DEVTMPFS=y
300300
CONFIG_DEVTMPFS_MOUNT=y
301301
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
302+
CONFIG_DM_KUNIT_TEST=m
302303
CONFIG_CONNECTOR=m
303304
CONFIG_PARPORT=m
304305
CONFIG_PARPORT_AMIGA=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ CONFIG_NET_IFE=m
295295
CONFIG_DEVTMPFS=y
296296
CONFIG_DEVTMPFS_MOUNT=y
297297
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
298+
CONFIG_DM_KUNIT_TEST=m
298299
CONFIG_CONNECTOR=m
299300
CONFIG_ZRAM=m
300301
CONFIG_BLK_DEV_LOOP=y
@@ -568,6 +569,7 @@ CONFIG_CRYPTO_USER_API_AEAD=m
568569
CONFIG_PRIME_NUMBERS=m
569570
CONFIG_CRC32_SELFTEST=m
570571
CONFIG_XZ_DEC_TEST=m
572+
CONFIG_GLOB_SELFTEST=m
571573
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
572574
CONFIG_MAGIC_SYSRQ=y
573575
CONFIG_TEST_LOCKUP=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ CONFIG_NET_IFE=m
302302
CONFIG_DEVTMPFS=y
303303
CONFIG_DEVTMPFS_MOUNT=y
304304
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
305+
CONFIG_DM_KUNIT_TEST=m
305306
CONFIG_CONNECTOR=m
306307
CONFIG_PARPORT=m
307308
CONFIG_PARPORT_ATARI=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ CONFIG_NET_IFE=m
292292
CONFIG_DEVTMPFS=y
293293
CONFIG_DEVTMPFS_MOUNT=y
294294
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
295+
CONFIG_DM_KUNIT_TEST=m
295296
CONFIG_CONNECTOR=m
296297
CONFIG_ZRAM=m
297298
CONFIG_BLK_DEV_LOOP=y
@@ -560,6 +561,7 @@ CONFIG_CRYPTO_USER_API_AEAD=m
560561
CONFIG_PRIME_NUMBERS=m
561562
CONFIG_CRC32_SELFTEST=m
562563
CONFIG_XZ_DEC_TEST=m
564+
CONFIG_GLOB_SELFTEST=m
563565
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
564566
CONFIG_MAGIC_SYSRQ=y
565567
CONFIG_TEST_LOCKUP=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ CONFIG_NET_IFE=m
294294
CONFIG_DEVTMPFS=y
295295
CONFIG_DEVTMPFS_MOUNT=y
296296
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
297+
CONFIG_DM_KUNIT_TEST=m
297298
CONFIG_CONNECTOR=m
298299
CONFIG_ZRAM=m
299300
CONFIG_BLK_DEV_LOOP=y
@@ -570,6 +571,7 @@ CONFIG_CRYPTO_USER_API_AEAD=m
570571
CONFIG_PRIME_NUMBERS=m
571572
CONFIG_CRC32_SELFTEST=m
572573
CONFIG_XZ_DEC_TEST=m
574+
CONFIG_GLOB_SELFTEST=m
573575
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
574576
CONFIG_MAGIC_SYSRQ=y
575577
CONFIG_TEST_LOCKUP=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ CONFIG_NET_IFE=m
296296
CONFIG_DEVTMPFS=y
297297
CONFIG_DEVTMPFS_MOUNT=y
298298
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
299+
CONFIG_DM_KUNIT_TEST=m
299300
CONFIG_CONNECTOR=m
300301
CONFIG_BLK_DEV_SWIM=m
301302
CONFIG_ZRAM=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ CONFIG_NET_IFE=m
316316
CONFIG_DEVTMPFS=y
317317
CONFIG_DEVTMPFS_MOUNT=y
318318
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
319+
CONFIG_DM_KUNIT_TEST=m
319320
CONFIG_CONNECTOR=m
320321
CONFIG_PARPORT=m
321322
CONFIG_PARPORT_PC=m

‎arch/m68k/configs/mvme147_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ CONFIG_NET_IFE=m
291291
CONFIG_DEVTMPFS=y
292292
CONFIG_DEVTMPFS_MOUNT=y
293293
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
294+
CONFIG_DM_KUNIT_TEST=m
294295
CONFIG_CONNECTOR=m
295296
CONFIG_ZRAM=m
296297
CONFIG_BLK_DEV_LOOP=y
@@ -559,6 +560,7 @@ CONFIG_CRYPTO_USER_API_AEAD=m
559560
CONFIG_PRIME_NUMBERS=m
560561
CONFIG_CRC32_SELFTEST=m
561562
CONFIG_XZ_DEC_TEST=m
563+
CONFIG_GLOB_SELFTEST=m
562564
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
563565
CONFIG_MAGIC_SYSRQ=y
564566
CONFIG_TEST_LOCKUP=m

‎arch/m68k/configs/mvme16x_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@ CONFIG_NET_IFE=m
292292
CONFIG_DEVTMPFS=y
293293
CONFIG_DEVTMPFS_MOUNT=y
294294
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
295+
CONFIG_DM_KUNIT_TEST=m
295296
CONFIG_CONNECTOR=m
296297
CONFIG_ZRAM=m
297298
CONFIG_BLK_DEV_LOOP=y
@@ -560,6 +561,7 @@ CONFIG_CRYPTO_USER_API_AEAD=m
560561
CONFIG_PRIME_NUMBERS=m
561562
CONFIG_CRC32_SELFTEST=m
562563
CONFIG_XZ_DEC_TEST=m
564+
CONFIG_GLOB_SELFTEST=m
563565
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
564566
CONFIG_MAGIC_SYSRQ=y
565567
CONFIG_TEST_LOCKUP=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ CONFIG_NET_IFE=m
293293
CONFIG_DEVTMPFS=y
294294
CONFIG_DEVTMPFS_MOUNT=y
295295
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
296+
CONFIG_DM_KUNIT_TEST=m
296297
CONFIG_CONNECTOR=m
297298
CONFIG_PARPORT=m
298299
CONFIG_PARPORT_PC=m

0 commit comments

Comments
 (0)