From a6c7ad2f65afaa717ba19cbf9d8d138b5f10ccf9 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Tue, 3 Dec 2002 21:28:10 +0000
Subject: * Fix startup problems with VFD display on TRAB

* Patch by Pierre Aubert, 20 Nov 2002
  Add driver for Epson SED13806 graphic controller.
  Add support for BMP logos in cfb_console driver.
---
 common/cmd_pcmcia.c |  2 +-
 common/devices.c    |  2 +-
 common/main.c       | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'common')

diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c
index 8b54585bf..4c799a52d 100644
--- a/common/cmd_pcmcia.c
+++ b/common/cmd_pcmcia.c
@@ -2062,7 +2062,7 @@ static int hardware_enable(int slot)
 	/*
 	 * Power On.
 	 */
-	printf("\n Slot %c:", 'A' + slot);
+	printf("%s  Slot %c:", slot ? "" : "\n", 'A' + slot);
 	mask = PCMCIA_VS1(slot) | PCMCIA_VS2(slot);
 	reg  = pcmp->pcmc_pipr;
 	debug ("PIPR: 0x%x ==> VS1=o%s, VS2=o%s\n",
diff --git a/common/devices.c b/common/devices.c
index 7489eac41..8bd0e64e3 100644
--- a/common/devices.c
+++ b/common/devices.c
@@ -177,7 +177,7 @@ int devices_init (void)
 #ifdef CONFIG_LCD
 	drv_lcd_init ();
 #endif
-#ifdef CONFIG_VIDEO
+#if defined(CONFIG_VIDEO) || defined(CONFIG_CFB_CONSOLE)
 	drv_video_init ();
 #endif
 #ifdef CONFIG_WL_4PPM_KEYBOARD
diff --git a/common/main.c b/common/main.c
index 08d54c5c1..3e92649ce 100644
--- a/common/main.c
+++ b/common/main.c
@@ -21,6 +21,8 @@
  * MA 02111-1307 USA
  */
 
+/* #define	DEBUG	*/
+
 #include <common.h>
 #include <watchdog.h>
 #include <command.h>
@@ -304,9 +306,7 @@ void main_loop (void)
 	s = getenv ("bootdelay");
 	bootdelay = s ? (int)simple_strtol(s, NULL, 10) : CONFIG_BOOTDELAY;
 
-#if 0
-	printf ("### main_loop entered:\n\n");
-#endif
+	debug ("### main_loop entered: bootdelay=%d\n\n", bootdelay);
 
 # ifdef CONFIG_BOOT_RETRY_TIME
 	s = getenv ("bootretry");
@@ -319,6 +319,9 @@ void main_loop (void)
 # endif	/* CONFIG_BOOT_RETRY_TIME */
 
 	s = getenv ("bootcmd");
+
+	debug ("### main_loop: bootcmd=\"%s\"\n", s ? s : "<UNDEFINED>");
+
 	if (bootdelay >= 0 && s && !abortboot (bootdelay)) {
 # ifdef CONFIG_AUTOBOOT_KEYED
 		int prev = disable_ctrlc(1);	/* disable Control C checking */
@@ -337,11 +340,9 @@ void main_loop (void)
 	}
 
 # ifdef CONFIG_MENUKEY
-	if (menukey == CONFIG_MENUKEY)
-	{
+	if (menukey == CONFIG_MENUKEY) {
 	    s = getenv("menucmd");
-	    if (s)
-	    {
+	    if (s) {
 # ifndef CFG_HUSH_PARSER
 		run_command (s, bd, 0);
 # else
-- 
cgit v1.2.3