mx53: Custom logo on bootup

diff --git a/_build/.config b/_build/.config
index ad2b0f809d86a561304f13cb538872a0f5f502e4..88f4d02b792d3245dec1e0a9b82596dcc5802f47 100644 (file)
--- a/_build/.config
+++ b/_build/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.35.3
-# Tue Feb 26 20:16:57 2013
+# Tue Mar  5 15:51:27 2013
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -1792,7 +1792,8 @@ CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
 # CONFIG_LOGO_LINUX_MONO is not set
 # CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO_LINUX_CLUT224 is not set
+CONFIG_LOGO_CUSTOM_CLUT224=y
 CONFIG_SOUND=y
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y

diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
index 39ac49e0682ced1eef75c5e0b31426e4efe26975..7ecb772d6023a37c839f75b87b459b732d1e7525 100644 (file)
--- a/drivers/video/logo/Kconfig
+++ b/drivers/video/logo/Kconfig
@@ -82,4 +82,8 @@ config LOGO_M32R_CLUT224
        depends on M32R
        default y
 
+config LOGO_CUSTOM_CLUT224
+       bool "224-color Custom logo"
+       default y
+
 endif # LOGO

diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile
index 3b437813584cec4f3d73ba5364353ac4a5cbb29b..5edf4d09fb7ca7cdfa3084dd37b24e9b3fca4730 100644 (file)
--- 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_CUSTOM_CLUT224)      += logo_custom_clut224.o
 
 obj-$(CONFIG_SPU_BASE)                 += logo_spe_clut224.o
 

diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c
index ea7a8ccc830c8659f23b13dc98db761b89a6c0da..2f8653badb67177823afb23c5197b9593299fa9f 100644 (file)
--- a/drivers/video/logo/logo.c
+++ b/drivers/video/logo/logo.c
@@ -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_CUSTOM_CLUT224
+               /* Custom logo */
+               logo = &logo_custom_clut224;
 #endif
        }
        return logo;

diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
index ca5bd91d12e169cd80eb6a546fe73c35df8ead91..2be299513819ddfe7d59b481c6ca908adc7e4bb0 100644 (file)
--- a/include/linux/linux_logo.h
+++ b/include/linux/linux_logo.h
@@ -47,6 +47,7 @@ extern const struct linux_logo logo_superh_vga16;
 extern const struct linux_logo logo_superh_clut224;
 extern const struct linux_logo logo_m32r_clut224;
 extern const struct linux_logo logo_spe_clut224;
+extern const struct linux_logo logo_custom_clut224;
 
 extern const struct linux_logo *fb_find_logo(int depth);
 #ifdef CONFIG_FB_LOGO_EXTRA