console.c: fix problem with splashimage

If a board uses cfb_console driver and splash image and also defines CONFIG_SILENT_CONSOLE, the user is locked out even if "silent" is not set. It is not possible to get any output, neither on vga console device nor on serial console after redirecting the output to the serial console, since the GD_FLG_SILENT flag remains set. Fix the problem by redirecting the output from frame buffer to serial console if splashimage is used. Only suppress the output if "silent" environment variable was set and don't set the GD_FLG_SILENT flag arbitrarily. Signed-off-by: Anatolij Gustschin <agust@denx.de>

console.c: fix problem with splashimage
If a board uses cfb_console driver and splash image and also defines CONFIG_SILENT_CONSOLE, the user is locked out even if "silent" is not set. It is not possible to get any output, neither on vga console device nor on serial console after redirecting the output to the serial console, since the GD_FLG_SILENT flag remains set. Fix the problem by redirecting the output from frame buffer to serial console if splashimage is used. Only suppress the output if "silent" environment variable was set and don't set the GD_FLG_SILENT flag arbitrarily. Signed-off-by: Anatolij Gustschin <agust@denx.de>
Anatolij Gustschin · Wolfgang Denk
1 parent 5647f78d04
Showing 1 changed file with 7 additions and 3 deletions Side-by-side Diff
common/console.c
@@ -659,10 +659,14 @@
 #ifdef CONFIG_SPLASH_SCREEN
 	/*
 	 * suppress all output if splash screen is enabled and we have
-	 * a bmp to display
+	 * a bmp to display. We redirect the output from frame buffer
+	 * console to serial console in this case or suppress it if
+	 * "silent" mode was requested.
 	 */
-	if (getenv("splashimage") != NULL)
-		gd->flags |= GD_FLG_SILENT;
+	if (getenv("splashimage") != NULL) {
+		if (!(gd->flags & GD_FLG_SILENT))
+			outputdev = search_device (DEV_FLAGS_OUTPUT, "serial");
+	}
 #endif
  
 	/* Scan devices looking for input and output devices */
...	...	@@ -659,10 +659,14 @@
659	659	#ifdef CONFIG_SPLASH_SCREEN
660	660	/*
661	661	* suppress all output if splash screen is enabled and we have
662		- * a bmp to display
	662	+ * a bmp to display. We redirect the output from frame buffer
	663	+ * console to serial console in this case or suppress it if
	664	+ * "silent" mode was requested.
663	665	*/
664		- if (getenv("splashimage") != NULL)
665		- gd->flags \|= GD_FLG_SILENT;
	666	+ if (getenv("splashimage") != NULL) {
	667	+ if (!(gd->flags & GD_FLG_SILENT))
	668	+ outputdev = search_device (DEV_FLAGS_OUTPUT, "serial");
	669	+ }
666	670	#endif
667	671
668	672	/* Scan devices looking for input and output devices */