Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cbfbae8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

video/logo: remove obsolete logo files 



The blackfin and m32r architectures are getting removed, so it's
time to clean up the logos as well.

Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 02741b8a

drivers/video/logo/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -27,16 +27,6 @@ config LOGO_LINUX_CLUT224 
	bool "Standard 224-color Linux logo"

	default y



config LOGO_BLACKFIN_VGA16

	bool "16-colour Blackfin Processor Linux logo"

	depends on BLACKFIN

	default y



config LOGO_BLACKFIN_CLUT224

	bool "224-colour Blackfin Processor Linux logo"

	depends on BLACKFIN

	default y



config LOGO_DEC_CLUT224

	bool "224-color Digital Equipment Corporation Linux logo"

	depends on MACH_DECSTATION || ALPHA
@@ -77,9 +67,4 @@ config LOGO_SUPERH_CLUT224 
	depends on SUPERH

	default y



config LOGO_M32R_CLUT224

	bool "224-color M32R Linux logo"

	depends on M32R

	default y



endif # LOGO

drivers/video/logo/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ obj-$(CONFIG_LOGO) += logo.o 
obj-$(CONFIG_LOGO_LINUX_MONO)		+= logo_linux_mono.o

obj-$(CONFIG_LOGO_LINUX_VGA16)		+= logo_linux_vga16.o

obj-$(CONFIG_LOGO_LINUX_CLUT224)	+= logo_linux_clut224.o

obj-$(CONFIG_LOGO_BLACKFIN_CLUT224)	+= logo_blackfin_clut224.o

obj-$(CONFIG_LOGO_BLACKFIN_VGA16)	+= logo_blackfin_vga16.o

obj-$(CONFIG_LOGO_DEC_CLUT224)		+= logo_dec_clut224.o

obj-$(CONFIG_LOGO_MAC_CLUT224)		+= logo_mac_clut224.o

obj-$(CONFIG_LOGO_PARISC_CLUT224)	+= logo_parisc_clut224.o
@@ -15,7 +13,6 @@ obj-$(CONFIG_LOGO_SUN_CLUT224) += logo_sun_clut224.o 
obj-$(CONFIG_LOGO_SUPERH_MONO)		+= logo_superh_mono.o

obj-$(CONFIG_LOGO_SUPERH_VGA16)		+= logo_superh_vga16.o

obj-$(CONFIG_LOGO_SUPERH_CLUT224)	+= logo_superh_clut224.o

obj-$(CONFIG_LOGO_M32R_CLUT224)		+= logo_m32r_clut224.o



obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o

drivers/video/logo/logo.c

+0 −12
Original line number Diff line number Diff line
@@ -63,10 +63,6 @@ const struct linux_logo * __ref fb_find_logo(int depth) 
		/* Generic Linux logo */

		logo = &logo_linux_vga16;

#endif

#ifdef CONFIG_LOGO_BLACKFIN_VGA16

		/* Blackfin processor logo */

		logo = &logo_blackfin_vga16;

#endif

#ifdef CONFIG_LOGO_SUPERH_VGA16

		/* SuperH Linux logo */

		logo = &logo_superh_vga16;
@@ -78,10 +74,6 @@ const struct linux_logo * __ref fb_find_logo(int depth) 
		/* Generic Linux logo */

		logo = &logo_linux_clut224;

#endif

#ifdef CONFIG_LOGO_BLACKFIN_CLUT224

		/* Blackfin Linux logo */

		logo = &logo_blackfin_clut224;

#endif

#ifdef CONFIG_LOGO_DEC_CLUT224

		/* DEC Linux logo on MIPS/MIPS64 or ALPHA */

		logo = &logo_dec_clut224;
@@ -106,10 +98,6 @@ const struct linux_logo * __ref fb_find_logo(int depth) 
#ifdef CONFIG_LOGO_SUPERH_CLUT224

		/* SuperH Linux logo */

		logo = &logo_superh_clut224;

#endif

#ifdef CONFIG_LOGO_M32R_CLUT224

		/* M32R Linux logo */

		logo = &logo_m32r_clut224;

#endif

	}

	return logo;