--- linuxppc_2_4_ORI/Documentation/Configure.help	2007-11-26 13:31:38.000000000 +0100
+++ linuxppc_2_4_devel/Documentation/Configure.help	2007-11-23 18:27:09.000000000 +0100
@@ -4815,6 +4815,19 @@ CONFIG_FB
   (e.g. an accelerated X server) and that are not frame buffer
   device-aware may cause unexpected results. If unsure, say N.
 
+Silicon Motion VOYAGER support (on TQM5200)
+CONFIG_FB_VOYAGER
+  This is the frame buffer device driver for the graphics controller
+  SM501 (VOYAGER) from Silicon Graphics on TQM5200 hardware. If
+  unsure, say N.
+
+Inherit pre-initialized framebuffer
+CONFIG_FB_PRE_INIT
+  When enabled and the console is set to anything else but tty0
+  (e.g. console=ttyS0) a previously initialized splashscreen
+  (e.g. by U-Boot's CONFIG_SPLASH_SCREEN feature) will remain
+  until a graphical user interface starts up. If unsure, say N.
+
 Acorn VIDC support
 CONFIG_FB_ACORN
   This is the frame buffer device driver for the Acorn VIDC graphics
--- linuxppc_2_4_ORI/drivers/char/console.c	2007-11-26 13:31:40.000000000 +0100
+++ linuxppc_2_4_devel/drivers/char/console.c	2007-11-23 11:49:06.000000000 +0100
@@ -621,14 +621,14 @@ void redraw_screen(int new_console, int 
 		set_origin(currcons);
 		update = sw->con_switch(vc_cons[currcons].d);
 		set_palette(currcons);
-#ifndef CONFIG_FB_8xx_PRE_INIT_FB
+#if !defined(CONFIG_FB_8xx_PRE_INIT_FB) && !defined(CONFIG_FB_PRE_INIT)
 		if (update && vcmode != KD_GRAPHICS)
 			do_update_region(currcons, origin, screenbuf_size/2);
-#endif /* ! CONFIG_8xx_PRE_INIT_FB */
+#endif /* ! CONFIG_FB*_PRE_INIT_FB */
 	}
-#ifndef CONFIG_FB_8xx_PRE_INIT_FB
+#if !defined(CONFIG_FB_8xx_PRE_INIT_FB) && !defined(CONFIG_FB_PRE_INIT)
 	set_cursor(currcons);
-#endif /* ! CONFIG_8xx_PRE_INIT_FB */
+#endif /* ! CONFIG_FB*_PRE_INIT_FB */
 	if (is_switch) {
 		set_leds();
 		compute_shiftstate();
--- linuxppc_2_4_ORI/drivers/video/Config.in	2007-11-26 13:31:44.000000000 +0100
+++ linuxppc_2_4_devel/drivers/video/Config.in	2007-11-23 11:38:00.000000000 +0100
@@ -11,6 +11,7 @@ if [ "$CONFIG_FB" = "y" ]; then
    define_bool CONFIG_DUMMY_CONSOLE y
    bool '  Silicon Motion VOYAGER support (on TQM5200)' CONFIG_FB_VOYAGER
    bool '  Fujitsu CoralP support' CONFIG_FB_MB86290
+   bool '  Inherit pre-initialized framebuffer' CONFIG_FB_PRE_INIT
    if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
       if [ "$CONFIG_PCI" = "y" ]; then
          tristate '  nVidia Riva support (EXPERIMENTAL)' CONFIG_FB_RIVA
--- linuxppc_2_4_ORI/drivers/video/fbcon.c	2007-11-26 13:31:44.000000000 +0100
+++ linuxppc_2_4_devel/drivers/video/fbcon.c	2007-11-23 11:49:58.000000000 +0100
@@ -572,7 +572,7 @@ static void fbcon_setup(int con, int ini
     int i, charcnt = 256;
     struct fbcon_font_desc *font;
     
-#ifdef CONFIG_FB_8xx_PRE_INIT_FB
+#if defined(CONFIG_FB_8xx_PRE_INIT_FB) || defined(CONFIG_FB_PRE_INIT)
     logo=0;
 #endif