update for NanoBoot LOGO

steven · steven · commit 901b405de71f · 2014-10-15T18:38:45.000+08:00
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
@@ -497,6 +497,10 @@ static int fb_show_logo_line(struct fb_info *info, int rotate,
 	image.dy = y;
 	image.width = logo->width;
 	image.height = logo->height;
+	
+	#ifdef CONFIG_CENTER_LOGO
+	image.dx = (info->var.xres - n*image.width )>>1;
+	#endif
 
 	if (rotate) {
 		logo_rotate = kmalloc(logo->width *
@@ -660,7 +664,7 @@ int fb_show_logo(struct fb_info *info, int rotate)
 	int y;
 
 	y = fb_show_logo_line(info, rotate, fb_logo.logo, 0,
-			      num_online_cpus());
+			      1 /*num_online_cpus()*/);
 	y = fb_show_extra_logos(info, y, rotate);
 
 	return y;
diff --git a/drivers/video/logo/Kconfig b/drivers/video/logo/Kconfig
@@ -81,5 +81,14 @@ config LOGO_M32R_CLUT224
 	bool "224-color M32R Linux logo"
 	depends on M32R
 	default y
+	
+config LOGO_NANOBOOT_CLUT224
+	bool "Standard 224-color nanoboot Linux logo"
+	default y
+	
+config CENTER_LOGO
+  bool "Center logo"
+  depends on LOGO
+  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_NANOBOOT_CLUT224)		+= logo_nanoboot_clut224.o
 
 obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o
 
diff --git 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_NANOBOOT_CLUT224
+  /* naoboot Linux logo */
+  logo = &logo_nanoboot_clut224;
 #endif
 	}
 	return logo;
diff --git a/drivers/video/logo/logo_nanoboot_clut224.ppm b/drivers/video/logo/logo_nanoboot_clut224.ppm
diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h
