summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-07-11 21:49:42 +0000
committerwdenk <wdenk>2004-07-11 21:49:42 +0000
commitb9283e2dbedae4492ec0efdf683d51a00566a477 (patch)
tree0074e23686525883b94c46ec092fedc85e767632 /drivers
parent810509266fba83fb73f28842fc99268e761bd43c (diff)
downloadu-boot-imx-b9283e2dbedae4492ec0efdf683d51a00566a477.zip
u-boot-imx-b9283e2dbedae4492ec0efdf683d51a00566a477.tar.gz
u-boot-imx-b9283e2dbedae4492ec0efdf683d51a00566a477.tar.bz2
* Patch by Dan Poirot, 06 Jul 2004:
Fix sbc8260 environment variables * Cleanup redundand "console" environment variable
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cfb_console.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/cfb_console.c b/drivers/cfb_console.c
index 138b968..6a8df79 100644
--- a/drivers/cfb_console.c
+++ b/drivers/cfb_console.c
@@ -1177,11 +1177,6 @@ int drv_video_init (void)
if (video_init () == -1)
skip_dev_init = 1;
- /* Force console i/o to serial ? */
- if ((penv = getenv ("console")) != NULL)
- if (strcmp (penv, "serial") == 0)
- return 0;
-
#ifdef CONFIG_VGA_AS_SINGLE_DEVICE
/* Devices VGA and Keyboard will be assigned seperately */
/* Init vga device */
@@ -1206,7 +1201,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 */