diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2026-03-02 13:25:20 +0300 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2026-04-08 12:15:26 +0300 |
| commit | cbd3b8ef970a2a4738c3b237ca8fe3fe5985627e (patch) | |
| tree | bed049a0c70483ff1aa0cc6f43a23bf350a69871 | |
| parent | 59747bec5d6e00a83ce5dfc8f7ac9b7113a11472 (diff) | |
| download | linux-cbd3b8ef970a2a4738c3b237ca8fe3fe5985627e.tar.xz | |
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 994fcd4b107d747b
("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
| -rw-r--r-- | arch/m68k/configs/amiga_defconfig | 2 | ||||
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 2 | ||||
| -rw-r--r-- | arch/m68k/configs/atari_defconfig | 2 | ||||
| -rw-r--r-- | arch/m68k/configs/hp300_defconfig | 2 | ||||
| -rw-r--r-- | arch/m68k/configs/mac_defconfig | 2 | ||||
| -rw-r--r-- | arch/m68k/configs/multi_defconfig | 2 | ||||
| -rw-r--r-- | arch/m68k/configs/q40_defconfig | 2 |
7 files changed, 13 insertions, 1 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig index 31d16cba9879..803a70ca2e8d 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -426,6 +426,8 @@ CONFIG_FB_FM2=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y CONFIG_SOUND=m CONFIG_DMASOUND_PAULA=m CONFIG_HID=m diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index c0c419ec9a9e..f6fdb836c922 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -384,7 +384,7 @@ CONFIG_FB=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_MONO=y # CONFIG_LOGO_LINUX_CLUT224 is not set CONFIG_HID=m CONFIG_HIDRAW=y diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index 2b7547ecc4c4..0805704855ef 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -406,6 +406,8 @@ CONFIG_FB=y CONFIG_FB_ATARI=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y CONFIG_SOUND=m CONFIG_DMASOUND_ATARI=m CONFIG_HID=m diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 35761920185c..15ac1ffd6ca6 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -386,6 +386,8 @@ CONFIG_FB=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y CONFIG_HID=m CONFIG_HIDRAW=y CONFIG_UHID=m diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 97e108c0d24f..b9b0905fc3bc 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -405,6 +405,8 @@ CONFIG_FB_VALKYRIE=y CONFIG_FB_MAC=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y CONFIG_HID=m CONFIG_HIDRAW=y CONFIG_UHID=m diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 7e9f83af9af4..702d04ea1594 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -485,6 +485,8 @@ CONFIG_FB_MAC=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y CONFIG_SOUND=m CONFIG_DMASOUND_ATARI=m CONFIG_DMASOUND_PAULA=m diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig index 36eb29ec54ee..4c98bb1fdcfc 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -393,6 +393,8 @@ CONFIG_PTP_1588_CLOCK=m CONFIG_FB=y CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y CONFIG_SOUND=m CONFIG_DMASOUND_Q40=m CONFIG_HID=m |