Skip to content

Commit cbd3b8e

Browse files
geertugeertu
committed
m68k: defconfig: Update defconfigs for v7.0-rc1
 - Restore the state of the standard black-and-white and 16-color Linux logos (no longer auto-enabled since commit 994fcd4 ("video/logo: don't select LOGO_LINUX_MONO and LOGO_LINUX_VGA16 by default")). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://patch.msgid.link/67dd5553e9289757c274d79ce1b13fca33fde25d.1772446429.git.geert@linux-m68k.org
1 parent 59747be commit cbd3b8e

7 files changed

Lines changed: 13 additions & 1 deletion

File tree

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,8 @@ CONFIG_FB_FM2=y
426426
CONFIG_FRAMEBUFFER_CONSOLE=y
427427
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
428428
CONFIG_LOGO=y
429+
CONFIG_LOGO_LINUX_MONO=y
430+
CONFIG_LOGO_LINUX_VGA16=y
429431
CONFIG_SOUND=m
430432
CONFIG_DMASOUND_PAULA=m
431433
CONFIG_HID=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ CONFIG_FB=y
384384
CONFIG_FRAMEBUFFER_CONSOLE=y
385385
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
386386
CONFIG_LOGO=y
387-
# CONFIG_LOGO_LINUX_VGA16 is not set
387+
CONFIG_LOGO_LINUX_MONO=y
388388
# CONFIG_LOGO_LINUX_CLUT224 is not set
389389
CONFIG_HID=m
390390
CONFIG_HIDRAW=y

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,8 @@ CONFIG_FB=y
406406
CONFIG_FB_ATARI=y
407407
CONFIG_FRAMEBUFFER_CONSOLE=y
408408
CONFIG_LOGO=y
409+
CONFIG_LOGO_LINUX_MONO=y
410+
CONFIG_LOGO_LINUX_VGA16=y
409411
CONFIG_SOUND=m
410412
CONFIG_DMASOUND_ATARI=m
411413
CONFIG_HID=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,8 @@ CONFIG_FB=y
386386
CONFIG_FRAMEBUFFER_CONSOLE=y
387387
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
388388
CONFIG_LOGO=y
389+
CONFIG_LOGO_LINUX_MONO=y
390+
CONFIG_LOGO_LINUX_VGA16=y
389391
CONFIG_HID=m
390392
CONFIG_HIDRAW=y
391393
CONFIG_UHID=m

‎arch/m68k/configs/mac_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,8 @@ CONFIG_FB_VALKYRIE=y
405405
CONFIG_FB_MAC=y
406406
CONFIG_FRAMEBUFFER_CONSOLE=y
407407
CONFIG_LOGO=y
408+
CONFIG_LOGO_LINUX_MONO=y
409+
CONFIG_LOGO_LINUX_VGA16=y
408410
CONFIG_HID=m
409411
CONFIG_HIDRAW=y
410412
CONFIG_UHID=m

‎arch/m68k/configs/multi_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,8 @@ CONFIG_FB_MAC=y
485485
CONFIG_FRAMEBUFFER_CONSOLE=y
486486
CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y
487487
CONFIG_LOGO=y
488+
CONFIG_LOGO_LINUX_MONO=y
489+
CONFIG_LOGO_LINUX_VGA16=y
488490
CONFIG_SOUND=m
489491
CONFIG_DMASOUND_ATARI=m
490492
CONFIG_DMASOUND_PAULA=m

‎arch/m68k/configs/q40_defconfig‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,8 @@ CONFIG_PTP_1588_CLOCK=m
393393
CONFIG_FB=y
394394
CONFIG_FRAMEBUFFER_CONSOLE=y
395395
CONFIG_LOGO=y
396+
CONFIG_LOGO_LINUX_MONO=y
397+
CONFIG_LOGO_LINUX_VGA16=y
396398
CONFIG_SOUND=m
397399
CONFIG_DMASOUND_Q40=m
398400
CONFIG_HID=m

0 commit comments

Comments
 (0)