MIPS: JZ4740: Add Dingux logo.

mthuurne · Nov 13, 2010 · e9d6ec7 · e9d6ec7
1 parent c3c4d20
commit e9d6ec7
Show file tree

Hide file tree

Showing 5 changed files with 4,336 additions and 2 deletions.
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
@@ -82,4 +82,9 @@ config LOGO_M32R_CLUT224
 	depends on M32R
 	default y
 
+config LOGO_DINGUX_CLUT224
+	bool "224-color Dingux logo"
+	depends on MACH_JZ4740
+	default y
+
 endif # LOGO
diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_LOGO_SUPERH_MONO)		+= logo_superh_mono.o
 obj-$(CONFIG_LOGO_SUPERH_VGA16)		+= logo_superh_vga16.o
 obj-$(CONFIG_LOGO_SUPERH_CLUT224)	+= logo_superh_clut224.o
 obj-$(CONFIG_LOGO_M32R_CLUT224)		+= logo_m32r_clut224.o
+obj-$(CONFIG_LOGO_DINGUX_CLUT224)	+= logo_dingux_clut224.o
 
 obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o
 

diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
@@ -46,7 +46,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
 		logo = &logo_superh_mono;
 #endif
 	}
-	
+
 	if (depth >= 4) {
 #ifdef CONFIG_LOGO_LINUX_VGA16
 		/* Generic Linux logo */
@@ -61,7 +61,7 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
 		logo = &logo_superh_vga16;
 #endif
 	}
-	
+
 	if (depth >= 8) {
 #ifdef CONFIG_LOGO_LINUX_CLUT224
 		/* Generic Linux logo */
@@ -99,6 +99,10 @@ const struct linux_logo * __init_refok fb_find_logo(int depth)
 #ifdef CONFIG_LOGO_M32R_CLUT224
 		/* M32R Linux logo */
 		logo = &logo_m32r_clut224;
+#endif
+#ifdef CONFIG_LOGO_DINGUX_CLUT224
+		/* Dingux logo on JZ47xx machines */
+		logo = &logo_dingux_clut224;
 #endif
 	}
 	return logo;