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

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

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: 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

drivers/video/logo/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -27,6 +27,16 @@ 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

drivers/video/logo/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 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

drivers/video/logo/logo.c

+10 −0
Original line number Diff line number Diff line
@@ -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;

drivers/video/logo/logo_blackfin_clut224.ppm

0 → 100644
+1127 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/video/logo/logo_blackfin_vga16.ppm

0 → 100644
+1127 −0

File added.

Preview size limit exceeded, changes collapsed.