Commit 122a881c authored by Robin Getz's avatar Robin Getz Committed by Linus Torvalds

video/logo: add support for Blackfin/Linux logo for framebuffer console

This art design is beautiful, isn't it?  And you can watch our demo on
YouTube: http://youtube.com/watch?v=fKyQOntPEFsSigned-off-by: default avatarRobin Getz <robin.getz@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e01c8e5
...@@ -27,6 +27,16 @@ config LOGO_LINUX_CLUT224 ...@@ -27,6 +27,16 @@ 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
......
...@@ -4,6 +4,8 @@ obj-$(CONFIG_LOGO) += logo.o ...@@ -4,6 +4,8 @@ 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
......
...@@ -24,6 +24,8 @@ ...@@ -24,6 +24,8 @@
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;
...@@ -65,6 +67,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) ...@@ -65,6 +67,10 @@ const struct linux_logo * __init_refok 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;
...@@ -76,6 +82,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth) ...@@ -76,6 +82,10 @@ const struct linux_logo * __init_refok 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;
......
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment