mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

video/logo: remove obsolete logo files

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

Acked-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2018-03-09 16:32:20 +01:00
parent 02741b8ae1
commit 8cbfbae850
7 changed files with 0 additions and 3579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/logo/Kconfig
View File

@@ -27,16 +27,6 @@ config LOGO_LINUX_CLUT224
bool "Standard 224-color Linux logo" bool "Standard 224-color Linux logo"
default y 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 config LOGO_DEC_CLUT224
bool "224-color Digital Equipment Corporation Linux logo" bool "224-color Digital Equipment Corporation Linux logo"
depends on MACH_DECSTATION || ALPHA depends on MACH_DECSTATION || ALPHA
@@ -77,9 +67,4 @@ config LOGO_SUPERH_CLUT224
depends on SUPERH depends on SUPERH
default y default y
config LOGO_M32R_CLUT224
bool "224-color M32R Linux logo"
depends on M32R
default y
endif # LOGO endif # LOGO

3
drivers/video/logo/Makefile
View File

@@ -5,8 +5,6 @@ obj-$(CONFIG_LOGO) += logo.o
obj-$(CONFIG_LOGO_LINUX_MONO) += logo_linux_mono.o obj-$(CONFIG_LOGO_LINUX_MONO) += logo_linux_mono.o
obj-$(CONFIG_LOGO_LINUX_VGA16) += logo_linux_vga16.o obj-$(CONFIG_LOGO_LINUX_VGA16) += logo_linux_vga16.o
obj-$(CONFIG_LOGO_LINUX_CLUT224) += logo_linux_clut224.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_DEC_CLUT224) += logo_dec_clut224.o
obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o obj-$(CONFIG_LOGO_MAC_CLUT224) += logo_mac_clut224.o
obj-$(CONFIG_LOGO_PARISC_CLUT224) += logo_parisc_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_MONO) += logo_superh_mono.o
obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o obj-$(CONFIG_LOGO_SUPERH_VGA16) += logo_superh_vga16.o
obj-$(CONFIG_LOGO_SUPERH_CLUT224) += logo_superh_clut224.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 obj-$(CONFIG_SPU_BASE) += logo_spe_clut224.o

12
drivers/video/logo/logo.c
View File

@@ -63,10 +63,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
/* Generic Linux logo */ /* Generic Linux logo */
logo = &logo_linux_vga16; logo = &logo_linux_vga16;
#endif #endif
#ifdef CONFIG_LOGO_BLACKFIN_VGA16
/* Blackfin processor logo */
logo = &logo_blackfin_vga16;
#endif
#ifdef CONFIG_LOGO_SUPERH_VGA16 #ifdef CONFIG_LOGO_SUPERH_VGA16
/* SuperH Linux logo */ /* SuperH Linux logo */
logo = &logo_superh_vga16; logo = &logo_superh_vga16;
@@ -78,10 +74,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
/* Generic Linux logo */ /* Generic Linux logo */
logo = &logo_linux_clut224; logo = &logo_linux_clut224;
#endif #endif
#ifdef CONFIG_LOGO_BLACKFIN_CLUT224
/* Blackfin Linux logo */
logo = &logo_blackfin_clut224;
#endif
#ifdef CONFIG_LOGO_DEC_CLUT224 #ifdef CONFIG_LOGO_DEC_CLUT224
/* DEC Linux logo on MIPS/MIPS64 or ALPHA */ /* DEC Linux logo on MIPS/MIPS64 or ALPHA */
logo = &logo_dec_clut224; logo = &logo_dec_clut224;
@@ -106,10 +98,6 @@ const struct linux_logo * __ref fb_find_logo(int depth)
#ifdef CONFIG_LOGO_SUPERH_CLUT224 #ifdef CONFIG_LOGO_SUPERH_CLUT224
/* SuperH Linux logo */ /* SuperH Linux logo */
logo = &logo_superh_clut224; logo = &logo_superh_clut224;
#endif
#ifdef CONFIG_LOGO_M32R_CLUT224
/* M32R Linux logo */
logo = &logo_m32r_clut224;
#endif #endif
} }
return logo; return logo;

1127
drivers/video/logo/logo_blackfin_clut224.ppm
View File

File diff suppressed because it is too large Load Diff

1127
drivers/video/logo/logo_blackfin_vga16.ppm
View File

File diff suppressed because it is too large Load Diff

1292
drivers/video/logo/logo_m32r_clut224.ppm
View File

File diff suppressed because it is too large Load Diff

3
include/linux/linux_logo.h
View File

@@ -36,8 +36,6 @@ struct linux_logo {
extern const struct linux_logo logo_linux_mono; extern const struct linux_logo logo_linux_mono;
extern const struct linux_logo logo_linux_vga16; extern const struct linux_logo logo_linux_vga16;
extern const struct linux_logo logo_linux_clut224; extern const struct linux_logo logo_linux_clut224;
extern const struct linux_logo logo_blackfin_vga16;
extern const struct linux_logo logo_blackfin_clut224;
extern const struct linux_logo logo_dec_clut224; extern const struct linux_logo logo_dec_clut224;
extern const struct linux_logo logo_mac_clut224; extern const struct linux_logo logo_mac_clut224;
extern const struct linux_logo logo_parisc_clut224; extern const struct linux_logo logo_parisc_clut224;
@@ -46,7 +44,6 @@ extern const struct linux_logo logo_sun_clut224;
extern const struct linux_logo logo_superh_mono; extern const struct linux_logo logo_superh_mono;
extern const struct linux_logo logo_superh_vga16; extern const struct linux_logo logo_superh_vga16;
extern const struct linux_logo logo_superh_clut224; extern const struct linux_logo logo_superh_clut224;
extern const struct linux_logo logo_m32r_clut224;
extern const struct linux_logo logo_spe_clut224; extern const struct linux_logo logo_spe_clut224;
extern const struct linux_logo *fb_find_logo(int depth); extern const struct linux_logo *fb_find_logo(int depth);