* Patch by Dan Poirot, 06 Jul 2004:

  Fix sbc8260 environment variables

* Cleanup redundand "console" environment variable

diff --git a/CHANGELOG b/CHANGELOG
index 8daa3baa31e52393b7a0f082a334149f8551b465..1082b91d18d6c4a78894e950415c35da829d32e8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 15056606cb9a25f7183f3b844bfa333e7b6736be..5fb20ae66c079c8fa7cae827310bba4c1de79c46 100644 (file)
--- 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 aa31ed3a70def9c16afbbe5e621f0d7abd0f2592..dd599693784b0fe578e14e4612a9cac894bacc6f 100644 (file)
--- 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 138b9689b565d8a84dc53b2f538f139c994c7908..6a8df79277ad927a61aa61611e3323030d9f8388 100644 (file)
--- 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 251d62a70b359cfaa89963db575becb5bd7b0d67..dc9cec360cb612c135cd0e186fe0767926f548f0 100644 (file)
--- 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;" \