From b028f7151379c5bb6814099fbbccb31d8b07b891 Mon Sep 17 00:00:00 2001
From: wdenk <wdenk>
Date: Sun, 7 Dec 2003 21:39:28 +0000
Subject: * 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
---
 common/cmd_pcmcia.c | 2 +-
 common/main.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'common')

diff --git a/common/cmd_pcmcia.c b/common/cmd_pcmcia.c
index 1a8c1239d88..3d38d5c6060 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 a0c9fe889fe..f465e2cf4b5 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;
 
-- 
cgit v1.2.3