logo: Added fngsystem boot logo

Cherry-pick from af765e15

(cherry picked from commit e03aff3ac82c5aadaa1b755f80074c90a57accda)

drivers/video/logo/Kconfig

@@ -68,10 +68,10 @@ config LOGO_SUPERH_CLUT224
 	depends on SUPERH
 	default y
 
-config LOGO_GF_FNGSYSTEM_CLUT224
-	bool "224-color Garz & Fricke FNG System Logo"
+config LOGO_FNGSYSTEM_CLUT224
+	bool "224-color SECO FNG System Logo"
 	depends on LOGO
-	default y
+	default n
 
 config LOGO_SECO_CLUT224
 	bool "224-color SECO Logo"

drivers/video/logo/Makefile

@@ -2,20 +2,20 @@
 # Makefile for the Linux logos
 
 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_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_SGI_CLUT224)		+= logo_sgi_clut224.o
-obj-$(CONFIG_LOGO_SUN_CLUT224)		+= logo_sun_clut224.o
-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_GF_FNGSYSTEM_CLUT224)	+= logo_gffngsystem_clut224.o
-obj-$(CONFIG_LOGO_SECO_CLUT224)		+= logo_seco_clut224.o
-obj-$(CONFIG_LOGO_EDGEHOG_CLUT224)	+= logo_edgehog_clut224.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_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_SGI_CLUT224)			+= logo_sgi_clut224.o
+obj-$(CONFIG_LOGO_SUN_CLUT224)			+= logo_sun_clut224.o
+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_FNGSYSTEM_CLUT224)	+= logo_fngsystem_clut224.o
+obj-$(CONFIG_LOGO_SECO_CLUT224)			+= logo_seco_clut224.o
+obj-$(CONFIG_LOGO_EDGEHOG_CLUT224)		+= logo_edgehog_clut224.o
 
 obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o
 

drivers/video/logo/logo.c

@@ -100,9 +100,9 @@ const struct linux_logo * __ref fb_find_logo(int depth)
 		/* SuperH Linux logo */
 		logo = &logo_superh_clut224;
 #endif
-#ifdef CONFIG_LOGO_GF_FNGSYSTEM_CLUT224
-		/* Garz&Fricke FNGSystem */
-		logo = &logo_gffngsystem_clut224;
+#ifdef CONFIG_LOGO_FNGSYSTEM_CLUT224
+		/* SECO FNG System logo */
+		logo = &logo_fngsystem_clut224;
 #endif
 #ifdef CONFIG_LOGO_SECO_CLUT224
 		/* SECO logo */

include/linux/linux_logo.h

@@ -45,7 +45,7 @@ extern const struct linux_logo logo_superh_mono;
 extern const struct linux_logo logo_superh_vga16;
 extern const struct linux_logo logo_superh_clut224;
 extern const struct linux_logo logo_spe_clut224;
-extern const struct linux_logo logo_gffngsystem_clut224;
+extern const struct linux_logo logo_fngsystem_clut224;
 extern const struct linux_logo logo_seco_clut224;
 extern const struct linux_logo logo_edgehog_clut224;