diff options
| author | wdenk <wdenk> | 2004-07-11 21:49:42 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-07-11 21:49:42 +0000 |
| commit | b9283e2dbedae4492ec0efdf683d51a00566a477 (patch) | |
| tree | 0074e23686525883b94c46ec092fedc85e767632 | |
| parent | 810509266fba83fb73f28842fc99268e761bd43c (diff) | |
| download | u-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
| -rw-r--r-- | CHANGELOG | 5 | ||||
| -rw-r--r-- | board/eltec/elppc/misc.c | 4 | ||||
| -rw-r--r-- | board/netphone/phone_console.c | 6 | ||||
| -rw-r--r-- | drivers/cfb_console.c | 7 | ||||
| -rw-r--r-- | include/configs/sbc8260.h | 2 |
5 files changed, 7 insertions, 17 deletions
@@ -2,6 +2,11 @@ Changes since U-Boot 1.1.1: ====================================================================== +* Patch by Dan Poirot, 06 Jul 2004: + Fix sbc8260 environment variables + +* Cleanup redundand "console" environment variable + * Patch by Mark Jonas, 05 Jul 2004: add support for the Total5100's and Total5200's LCD screen diff --git a/board/eltec/elppc/misc.c b/board/eltec/elppc/misc.c index 1505660..5fb20ae 100644 --- a/board/eltec/elppc/misc.c +++ b/board/eltec/elppc/misc.c @@ -250,10 +250,6 @@ int misc_init_r (void) eerev.etheraddr[4], eerev.etheraddr[5]); setenv ("ethaddr", buf); - /* set serial console as default */ - if ((ptr = getenv ("console")) == NULL) - setenv ("console", "serial"); - /* print actual board identification */ printf ("Ident: %s Ser %s Rev %c%c\n", eerev.board, (char *) &eerev.serial, diff --git a/board/netphone/phone_console.c b/board/netphone/phone_console.c index aa31ed3..dd59969 100644 --- a/board/netphone/phone_console.c +++ b/board/netphone/phone_console.c @@ -328,12 +328,6 @@ int drv_phone_init(void) device_t console_dev; char *penv; - /* - * Force console i/o to serial ? - */ - if ((penv = getenv("console")) != NULL && strcmp(penv, "serial") == 0) - return 0; - console_init(); memset(&console_dev, 0, sizeof(console_dev)); 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 */ diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h index 251d62a..dc9cec3 100644 --- a/include/configs/sbc8260.h +++ b/include/configs/sbc8260.h @@ -352,7 +352,7 @@ * */ #define CONFIG_EXTRA_ENV_SETTINGS \ - "serverip=192.168.123.205\0\0" \ + "serverip=192.168.123.205\0" \ "ipaddr=192.168.123.213\0" \ "reprog="\ "bootp;" \ |