From 7fc3bc355d3747f7e1d66d16bc91d03cc186d5b6 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sun, 26 Feb 2012 16:46:23 +0000 Subject: [PATCH] Remove all framebuffer bootup logos. * debian/changelog: Update. * debian/config: Disable LOGO. svn path=/dists/sid/linux-2.6/; revision=18738 --- debian/changelog | 1 + debian/config/alpha/config | 5 ----- debian/config/armel/config.versatile | 8 -------- debian/config/config | 5 +++++ debian/config/hppa/config | 9 --------- debian/config/ia64/config | 8 -------- debian/config/kernelarch-x86/config | 5 ----- debian/config/m68k/config.amiga | 8 -------- debian/config/m68k/config.atari | 5 ----- debian/config/m68k/config.mac | 9 --------- debian/config/m68k/config.mvme147 | 8 -------- debian/config/m68k/config.mvme16x | 8 -------- debian/config/mips/config.4kc-malta | 5 ----- debian/config/mips/config.5kc-malta | 5 ----- debian/config/mips/config.r4k-ip22 | 9 --------- debian/config/mips/config.r5k-ip32 | 9 --------- debian/config/mips/config.sb1-bcm91250a | 8 -------- debian/config/mips/config.sb1a-bcm91480b | 8 -------- debian/config/powerpc/config | 8 -------- debian/config/sh4/config.sh7751r | 8 -------- debian/config/sh4/config.sh7785lcr | 8 -------- debian/config/sparc/config | 9 --------- 22 files changed, 6 insertions(+), 150 deletions(-) diff --git a/debian/changelog b/debian/changelog index ef3bc8b6d..b11e80d30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -31,6 +31,7 @@ linux-2.6 (3.2.7-1) UNRELEASED; urgency=low * [hppa,mips,mipsel] Don't built-in cramfs support. * [alpha,hppa] Don't built-in ext2. * Remove IDE trigger for LED support. + * Remove all framebuffer bootup logos. -- Ben Hutchings Fri, 17 Feb 2012 03:29:39 +0000 diff --git a/debian/config/alpha/config b/debian/config/alpha/config index 2297787b4..9ab681467 100644 --- a/debian/config/alpha/config +++ b/debian/config/alpha/config @@ -1010,11 +1010,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=m CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -# CONFIG_LOGO is not set - ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/armel/config.versatile b/debian/config/armel/config.versatile index 32330a9e4..01104c88b 100644 --- a/debian/config/armel/config.versatile +++ b/debian/config/armel/config.versatile @@ -458,14 +458,6 @@ CONFIG_FONT_8x16=y ## CONFIG_DISPLAY_SUPPORT=m -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y - ## ## file: kernel/Kconfig.preempt ## diff --git a/debian/config/config b/debian/config/config index 25d36915a..0a249d8c6 100644 --- a/debian/config/config +++ b/debian/config/config @@ -3186,6 +3186,11 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y ## CONFIG_DISPLAY_SUPPORT=m +## +## file: drivers/video/logo/Kconfig +## +# CONFIG_LOGO is not set + ## ## file: drivers/virtio/Kconfig ## diff --git a/debian/config/hppa/config b/debian/config/hppa/config index bd5b7214a..994b4add7 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -623,15 +623,6 @@ CONFIG_STI_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_LOGO_PARISC_CLUT224=y - ## ## file: drivers/w1/Kconfig ## diff --git a/debian/config/ia64/config b/debian/config/ia64/config index 0647289fa..5e601ebb1 100644 --- a/debian/config/ia64/config +++ b/debian/config/ia64/config @@ -758,14 +758,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y - ## ## file: fs/partitions/Kconfig ## diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config index a2993f1c1..3f6733728 100644 --- a/debian/config/kernelarch-x86/config +++ b/debian/config/kernelarch-x86/config @@ -1505,11 +1505,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -# CONFIG_LOGO is not set - ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/m68k/config.amiga b/debian/config/m68k/config.amiga index f2aa02da4..38ead29e9 100644 --- a/debian/config/m68k/config.amiga +++ b/debian/config/m68k/config.amiga @@ -245,14 +245,6 @@ CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_FONT_PEARL_8x8=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y - ## ## file: drivers/zorro/Kconfig ## diff --git a/debian/config/m68k/config.atari b/debian/config/m68k/config.atari index e2b9ee1bd..4d8d785b9 100644 --- a/debian/config/m68k/config.atari +++ b/debian/config/m68k/config.atari @@ -157,11 +157,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -# CONFIG_LOGO is not set - ## ## file: fs/nfs/Kconfig ## diff --git a/debian/config/m68k/config.mac b/debian/config/m68k/config.mac index 0f6e3f33c..9add5055c 100644 --- a/debian/config/m68k/config.mac +++ b/debian/config/m68k/config.mac @@ -157,15 +157,6 @@ CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y CONFIG_FONT_6x11=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y -CONFIG_LOGO_MAC_CLUT224=y - ## ## file: fs/hfs/Kconfig ## diff --git a/debian/config/m68k/config.mvme147 b/debian/config/m68k/config.mvme147 index 3fa5aee7d..1fd28f550 100644 --- a/debian/config/m68k/config.mvme147 +++ b/debian/config/m68k/config.mvme147 @@ -94,14 +94,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y - ## ## file: fs/nfs/Kconfig ## diff --git a/debian/config/m68k/config.mvme16x b/debian/config/m68k/config.mvme16x index 4786fdaf9..6ab42f6cf 100644 --- a/debian/config/m68k/config.mvme16x +++ b/debian/config/m68k/config.mvme16x @@ -99,14 +99,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y -CONFIG_LOGO_LINUX_CLUT224=y - ## ## file: fs/nfs/Kconfig ## diff --git a/debian/config/mips/config.4kc-malta b/debian/config/mips/config.4kc-malta index 54217cc10..d9ea86dae 100644 --- a/debian/config/mips/config.4kc-malta +++ b/debian/config/mips/config.4kc-malta @@ -1052,11 +1052,6 @@ CONFIG_FONT_8x16=y ## CONFIG_DISPLAY_SUPPORT=m -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y - ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/mips/config.5kc-malta b/debian/config/mips/config.5kc-malta index 064189247..82d3d4c28 100644 --- a/debian/config/mips/config.5kc-malta +++ b/debian/config/mips/config.5kc-malta @@ -1056,11 +1056,6 @@ CONFIG_FONT_8x16=y ## CONFIG_DISPLAY_SUPPORT=m -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y - ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/mips/config.r4k-ip22 b/debian/config/mips/config.r4k-ip22 index f82a287b1..ac68a40e0 100644 --- a/debian/config/mips/config.r4k-ip22 +++ b/debian/config/mips/config.r4k-ip22 @@ -466,15 +466,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_LOGO_SGI_CLUT224=y - ## ## file: drivers/w1/Kconfig ## diff --git a/debian/config/mips/config.r5k-ip32 b/debian/config/mips/config.r5k-ip32 index bfb8600d6..7f0b00e7d 100644 --- a/debian/config/mips/config.r5k-ip32 +++ b/debian/config/mips/config.r5k-ip32 @@ -581,15 +581,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_LOGO_SGI_CLUT224=y - ## ## file: drivers/w1/Kconfig ## diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index 3c66cb4b9..d61b2068e 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -735,14 +735,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set - ## ## file: drivers/w1/Kconfig ## diff --git a/debian/config/mips/config.sb1a-bcm91480b b/debian/config/mips/config.sb1a-bcm91480b index 40692ecb3..5f04135dd 100644 --- a/debian/config/mips/config.sb1a-bcm91480b +++ b/debian/config/mips/config.sb1a-bcm91480b @@ -741,14 +741,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set - ## ## file: drivers/w1/Kconfig ## diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 07d640e85..83b37341c 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -861,14 +861,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -CONFIG_LOGO_LINUX_VGA16=y -# CONFIG_LOGO_LINUX_CLUT224 is not set - ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r index e63d8a050..817999e93 100644 --- a/debian/config/sh4/config.sh7751r +++ b/debian/config/sh4/config.sh7751r @@ -172,14 +172,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -CONFIG_LOGO_SUPERH_MONO=y -CONFIG_LOGO_SUPERH_VGA16=y -CONFIG_LOGO_SUPERH_CLUT224=y - ## ## file: fs/ext3/Kconfig ## diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr index 69b7347e0..37dedb24f 100644 --- a/debian/config/sh4/config.sh7785lcr +++ b/debian/config/sh4/config.sh7785lcr @@ -218,14 +218,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FONT_8x8=y CONFIG_FONT_8x16=y -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -CONFIG_LOGO_SUPERH_MONO=y -CONFIG_LOGO_SUPERH_VGA16=y -CONFIG_LOGO_SUPERH_CLUT224=y - ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 28d4973fb..99549f6a3 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -538,15 +538,6 @@ CONFIG_FONT_8x16=y CONFIG_FONT_SUN8x16=y # CONFIG_FONT_SUN12x22 is not set -## -## file: drivers/video/logo/Kconfig -## -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -# CONFIG_LOGO_LINUX_CLUT224 is not set -CONFIG_LOGO_SUN_CLUT224=y - ## ## file: drivers/w1/Kconfig ##