summaryrefslogtreecommitdiffstats
path: root/board/mcc200
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2007-06-11 19:03:23 -0500
committerWolfgang Denk <wd@denx.de>2007-07-04 00:35:03 +0200
commit9107ebe0d352420895ab69b715697bdebc8caf50 (patch)
tree9efe29c62f6f389028ea497a2a9f9b4450b780e3 /board/mcc200
parent5e378003d592ea828ec69d6defcd4de79096dd5c (diff)
downloadblackbird-obmc-uboot-9107ebe0d352420895ab69b715697bdebc8caf50.tar.gz
blackbird-obmc-uboot-9107ebe0d352420895ab69b715697bdebc8caf50.zip
board/[k-z]*: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).
This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely. All transformations are of the form: Before: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) After: #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT) Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'board/mcc200')
-rw-r--r--board/mcc200/auto_update.c2
-rw-r--r--board/mcc200/mcc200.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/mcc200/auto_update.c b/board/mcc200/auto_update.c
index 90d03ec47a..d9936d2809 100644
--- a/board/mcc200/auto_update.c
+++ b/board/mcc200/auto_update.c
@@ -44,7 +44,7 @@
#error "must define CFG_HUSH_PARSER"
#endif
-#if !(CONFIG_COMMANDS & CFG_CMD_FAT)
+#if !((CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT))
#error "must define CFG_CMD_FAT"
#endif
diff --git a/board/mcc200/mcc200.c b/board/mcc200/mcc200.c
index af047e2a07..c6a9ecbace 100644
--- a/board/mcc200/mcc200.c
+++ b/board/mcc200/mcc200.c
@@ -322,7 +322,7 @@ void ide_set_reset (int idereset)
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
-#if (CONFIG_COMMANDS & CFG_CMD_DOC)
+#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
void doc_init (void)
{
OpenPOWER on IntegriCloud