[rpi02] video: Add Raspberry Pi logo

Signed-off-by: Dom Cobley <popcornmix@gmail.com> [SA: use logo_rpi_clut224 instead of overwriting logo_linux_clut224] Signed-off-by: Simon Arlott <simon@fire.lp0.eu>
nomis · Jan 4, 2013 · f224f2d · f224f2d
1 parent 1e5ff0f
commit f224f2d
Show file tree

Hide file tree

Showing 5 changed files with 894 additions and 0 deletions.
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
@@ -52,6 +52,11 @@ config LOGO_PARISC_CLUT224
 	depends on PARISC
 	default y
 
+config LOGO_RPI_CLUT224
+	bool "224-color Raspberry Pi logo"
+	depends on ARCH_BCM2708
+	default y
+
 config LOGO_SGI_CLUT224
 	bool "224-color SGI Linux logo"
 	depends on SGI_IP22 || SGI_IP27 || SGI_IP32 || X86_VISWS

diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
@@ -9,6 +9,7 @@ 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
+obj-$(CONFIG_LOGO_RPI_CLUT224)		+= logo_rpi_clut224.o
 obj-$(CONFIG_LOGO_SGI_CLUT224)		+= logo_sgi_clut224.o
 obj-$(CONFIG_LOGO_SUN_CLUT224)		+= logo_sun_clut224.o
 obj-$(CONFIG_LOGO_SUPERH_MONO)		+= logo_superh_mono.o

diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
@@ -84,6 +84,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
 		/* PA-RISC Linux logo */
 		logo = &logo_parisc_clut224;
 #endif
+#ifdef CONFIG_LOGO_RPI_CLUT224
+		/* Raspberry Pi logo */
+		logo = &logo_rpi_clut224;
+#endif
 #ifdef CONFIG_LOGO_SGI_CLUT224
 		/* SGI Linux logo on MIPS/MIPS64 and VISWS */
 		logo = &logo_sgi_clut224;