LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Patch by Dan Poirot, 06 Jul 2004: 

Fix sbc8260 environment variables

* Cleanup redundand "console" environment variable
This commit is contained in:
wdenk 2004-07-11 21:49:42 +00:00
parent 810509266f
commit b9283e2dbe
5 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -2,6 +2,11 @@
Changes since U-Boot 1.1.1: 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: * Patch by Mark Jonas, 05 Jul 2004:
add support for the Total5100's and Total5200's LCD screen add support for the Total5100's and Total5200's LCD screen

4
board/eltec/elppc/misc.c
View File

@ -250,10 +250,6 @@ int misc_init_r (void)
eerev.etheraddr[4], eerev.etheraddr[5]); eerev.etheraddr[4], eerev.etheraddr[5]);
setenv ("ethaddr", buf); setenv ("ethaddr", buf);
/* set serial console as default */
if ((ptr = getenv ("console")) == NULL)
setenv ("console", "serial");
/* print actual board identification */ /* print actual board identification */
printf ("Ident: %s Ser %s Rev %c%c\n", printf ("Ident: %s Ser %s Rev %c%c\n",
eerev.board, (char *) &eerev.serial, eerev.board, (char *) &eerev.serial,

6
board/netphone/phone_console.c
View File

@ -328,12 +328,6 @@ int drv_phone_init(void)
device_t console_dev; device_t console_dev;
char *penv; char *penv;
/*
* Force console i/o to serial ?
*/
if ((penv = getenv("console")) != NULL && strcmp(penv, "serial") == 0)
return 0;
console_init(); console_init();
memset(&console_dev, 0, sizeof(console_dev)); memset(&console_dev, 0, sizeof(console_dev));

7
drivers/cfb_console.c
View File

@ -1177,11 +1177,6 @@ int drv_video_init (void)
if (video_init () == -1) if (video_init () == -1)
skip_dev_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 #ifdef CONFIG_VGA_AS_SINGLE_DEVICE
/* Devices VGA and Keyboard will be assigned seperately */ /* Devices VGA and Keyboard will be assigned seperately */
/* Init vga device */ /* Init vga device */
@ -1206,7 +1201,7 @@ int drv_video_init (void)
/* Init console device */ /* Init console device */
if (!skip_dev_init) { if (!skip_dev_init) {
memset (&console_dev, 0, sizeof (console_dev)); 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.ext = DEV_EXT_VIDEO; /* Video extensions */
console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM; console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
console_dev.putc = video_putc; /* 'putc' function */ console_dev.putc = video_putc; /* 'putc' function */

2
include/configs/sbc8260.h
View File

@ -352,7 +352,7 @@
* *
*/ */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"serverip=192.168.123.205\0\0" \ "serverip=192.168.123.205\0" \
"ipaddr=192.168.123.213\0" \ "ipaddr=192.168.123.213\0" \
"reprog="\ "reprog="\
"bootp;" \ "bootp;" \