Fix yet another recently introduced bug.

[karo-tx-uboot.git] / drivers / cfb_console.c

diff --git a/drivers/cfb_console.c b/drivers/cfb_console.c
index fee0386ae109ff1c81628c0d66640acf2e97ea2e..1eaac4771ed2b0be00de4d3062ab90c657e91db3 100644 (file)
--- a/drivers/cfb_console.c
+++ b/drivers/cfb_console.c
@@ -123,7 +123,9 @@ CONFIG_VIDEO_HW_CURSOR:          - Uses the hardware cursor capability of the
 /*****************************************************************************/
 #ifdef CONFIG_VIDEO_SED13806
 
+#ifndef CONFIG_TOTAL5200
 #define VIDEO_FB_LITTLE_ENDIAN
+#endif
 #define VIDEO_HW_RECTFILL
 #define VIDEO_HW_BITBLT
 #endif
@@ -1169,18 +1171,13 @@ int drv_video_init (void)
 {
        int skip_dev_init;
        device_t console_dev;
-       char *penv;
 
        skip_dev_init = 0;
 
-       /* Force console i/o to serial ? */
-       if ((penv = getenv ("console")) != NULL)
-               if (strcmp (penv, "serial") == 0)
-                       return 0;
-
        /* Init video chip - returns with framebuffer cleared */
        if (video_init () == -1)
                skip_dev_init = 1;
+
 #ifdef CONFIG_VGA_AS_SINGLE_DEVICE
        /* Devices VGA and Keyboard will be assigned seperately */
        /* Init vga device */
@@ -1205,7 +1202,7 @@ int drv_video_init (void)
        /* Init console device */
        if (!skip_dev_init) {
                memset (&console_dev, 0, sizeof (console_dev));
-               strcpy (console_dev.name, "console");
+               strcpy (console_dev.name, "vga");
                console_dev.ext = DEV_EXT_VIDEO;        /* Video extensions */
                console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
                console_dev.putc = video_putc;  /* 'putc' function */