Commit b9283e2d authored by wdenk's avatar wdenk

* Patch by Dan Poirot, 06 Jul 2004:

  Fix sbc8260 environment variables

* Cleanup redundand "console" environment variable
parent 81050926
......@@ -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
......
......@@ -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,
......
......@@ -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));
......
......@@ -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 */
......
......@@ -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;" \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment