diff options
| author | wdenk <wdenk> | 2003-12-07 21:39:28 +0000 |
|---|---|---|
| committer | wdenk <wdenk> | 2003-12-07 21:39:28 +0000 |
| commit | b028f7151379c5bb6814099fbbccb31d8b07b891 (patch) | |
| tree | 6b96f658b7b8f2f3ecd21b0e102b01aea1998d74 /common | |
| parent | b4676a25e2feb15826d960f4a216c3c429d2de75 (diff) | |
| download | talos-obmc-uboot-b028f7151379c5bb6814099fbbccb31d8b07b891.tar.gz talos-obmc-uboot-b028f7151379c5bb6814099fbbccb31d8b07b891.zip | |
* Patch by Yuli Barcohen, 3 Dec 2003:
"revive" U-Boot support for old Motorola MPC860ADS board
* Patch by Cam(ilo?), 03 Dec 2003:
make examples build even with broken Montavista objcopy
* Patch by Pavel Bartusek, 27 Nov 2003:
fix conversion problem with "bootretry" evironment variable
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_pcmcia.c | 2 | ||||
| -rw-r--r-- | common/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c index 1a8c1239d8..3d38d5c606 100644 --- a/common/cmd_pcmcia.c +++ b/common/cmd_pcmcia.c @@ -57,7 +57,7 @@ #include <command.h> #include <config.h> #include <pcmcia.h> -#if defined(CONFIG_IDE_8xx_PCCARD) && defined(CONFIG_8xx) +#if defined(CONFIG_8xx) #include <mpc8xx.h> #endif #if defined(CONFIG_LWMON) diff --git a/common/main.c b/common/main.c index a0c9fe889f..f465e2cf4b 100644 --- a/common/main.c +++ b/common/main.c @@ -505,7 +505,7 @@ void init_cmd_timeout(void) char *s = getenv ("bootretry"); if (s != NULL) - retry_time = (int)simple_strtoul(s, NULL, 10); + retry_time = (int)simple_strtol(s, NULL, 10); else retry_time = CONFIG_BOOT_RETRY_TIME; |
