make show_boot_progress () weak.
Signed-off-by: Heiko Schocher <hs@denx.de>
diff --git a/common/cmd_doc.c b/common/cmd_doc.c
index 4e624a2..9814d75 100644
--- a/common/cmd_doc.c
+++ b/common/cmd_doc.c
@@ -12,13 +12,6 @@
#include <malloc.h>
#include <asm/io.h>
-#ifdef CONFIG_SHOW_BOOT_PROGRESS
-# include <status_led.h>
-# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg)
-#else
-# define SHOW_BOOT_PROGRESS(arg)
-#endif
-
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#include <linux/mtd/nftl.h>
@@ -216,7 +209,7 @@
image_header_t *hdr;
int rcode = 0;
- SHOW_BOOT_PROGRESS (34);
+ show_boot_progress (34);
switch (argc) {
case 1:
addr = CFG_LOAD_ADDR;
@@ -237,27 +230,27 @@
break;
default:
printf ("Usage:\n%s\n", cmdtp->usage);
- SHOW_BOOT_PROGRESS (-35);
+ show_boot_progress (-35);
return 1;
}
- SHOW_BOOT_PROGRESS (35);
+ show_boot_progress (35);
if (!boot_device) {
puts ("\n** No boot device **\n");
- SHOW_BOOT_PROGRESS (-36);
+ show_boot_progress (-36);
return 1;
}
- SHOW_BOOT_PROGRESS (36);
+ show_boot_progress (36);
dev = simple_strtoul(boot_device, &ep, 16);
if ((dev >= CFG_MAX_DOC_DEVICE) ||
(doc_dev_desc[dev].ChipID == DOC_ChipID_UNKNOWN)) {
printf ("\n** Device %d not available\n", dev);
- SHOW_BOOT_PROGRESS (-37);
+ show_boot_progress (-37);
return 1;
}
- SHOW_BOOT_PROGRESS (37);
+ show_boot_progress (37);
printf ("\nLoading from device %d: %s at 0x%lX (offset 0x%lX)\n",
dev, doc_dev_desc[dev].name, doc_dev_desc[dev].physadr,
@@ -266,10 +259,10 @@
if (doc_rw (doc_dev_desc + dev, 1, offset,
SECTORSIZE, NULL, (u_char *)addr)) {
printf ("** Read error on %d\n", dev);
- SHOW_BOOT_PROGRESS (-38);
+ show_boot_progress (-38);
return 1;
}
- SHOW_BOOT_PROGRESS (38);
+ show_boot_progress (38);
hdr = (image_header_t *)addr;
@@ -281,18 +274,18 @@
cnt -= SECTORSIZE;
} else {
puts ("\n** Bad Magic Number **\n");
- SHOW_BOOT_PROGRESS (-39);
+ show_boot_progress (-39);
return 1;
}
- SHOW_BOOT_PROGRESS (39);
+ show_boot_progress (39);
if (doc_rw (doc_dev_desc + dev, 1, offset + SECTORSIZE, cnt,
NULL, (u_char *)(addr+SECTORSIZE))) {
printf ("** Read error on %d\n", dev);
- SHOW_BOOT_PROGRESS (-40);
+ show_boot_progress (-40);
return 1;
}
- SHOW_BOOT_PROGRESS (40);
+ show_boot_progress (40);
/* Loading ok, update default load address */