diff options
| author | Robin Getz <robin.getz@analog.com> | 2008-05-15 01:05:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-15 04:11:14 +0200 |
| commit | 122a881c776b7c155bf3f379928cc27aab435288 (patch) | |
| tree | 758ad357fc62baad1f1ea81465207117de5cf137 /drivers/video/logo/logo.c | |
| parent | ext3/4: fix uninitialized bs in ext3/4_xattr_set_handle() (diff) | |
| download | linux-122a881c776b7c155bf3f379928cc27aab435288.tar.xz linux-122a881c776b7c155bf3f379928cc27aab435288.zip | |
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=fKyQOntPEFs
Signed-off-by: Robin Getz <robin.getz@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/logo/logo.c')
| -rw-r--r-- | drivers/video/logo/logo.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index fc72684aae5a..2e85a2b52d05 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -24,6 +24,8 @@ extern const struct linux_logo logo_linux_mono; extern const struct linux_logo logo_linux_vga16; 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_mac_clut224; extern const struct linux_logo logo_parisc_clut224; @@ -65,6 +67,10 @@ const struct linux_logo * __init_refok 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; @@ -76,6 +82,10 @@ const struct linux_logo * __init_refok 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; |