summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2007-08-18 14:37:52 +0200
committerStefan Roese <sr@denx.de>2007-08-18 14:37:52 +0200
commit26667b7fa05a8bf2fc65fb9f3230b02b1a10c367 (patch)
tree4d60042cf02b3410f9b7fe2579e74177b3318210
parent8280f6a1c43247616b68224675188e5ccd124650 (diff)
ColdFire: Fix some remaining problems with CFG_CMD_
Signed-off-by: Stefan Roese <sr@denx.de>
-rw-r--r--common/cmd_bdinfo.c4
-rw-r--r--doc/README.m54455evb2
-rw-r--r--include/configs/idmr.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 7686080f351..ef15a006cd1 100644
--- a/common/cmd_bdinfo.c
+++ b/common/cmd_bdinfo.c
@@ -237,7 +237,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
print_str ("inpfreq", strmhz(buf, bd->bi_inpfreq));
print_str ("vcofreq", strmhz(buf, bd->bi_vcofreq));
#endif
-#if defined(CFG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
puts ("ethaddr =");
for (i=0; i<6; ++i) {
printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]);
@@ -266,7 +266,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
puts ("\nip_addr = ");
print_IPaddr (bd->bi_ip_addr);
-#endif /* CONFIG_CMD_NET */
+#endif
printf ("\nbaudrate = %d bps\n", bd->bi_baudrate);
return 0;
diff --git a/doc/README.m54455evb b/doc/README.m54455evb
index c768fc8a409..119a19d8971 100644
--- a/doc/README.m54455evb
+++ b/doc/README.m54455evb
@@ -78,7 +78,7 @@ CONFIG_MCFRTC -- define to use common CF RTC driver
CFG_MCFRTC_BASE -- provide base address for RTC in immap.h
CFG_RTC_OSCILLATOR -- define RTC clock frequency
RTC_DEBUG -- define to show RTC debug message
-CFG_CMD_DATE -- enable to use date feature in u-boot
+CONFIG_CMD_DATE -- enable to use date feature in u-boot
CONFIG_MCFFEC -- define to use common CF FEC driver
CONFIG_NET_MULTI -- define to use multi FEC in u-boot
diff --git a/include/configs/idmr.h b/include/configs/idmr.h
index 3ec4a79440f..404e88a4fcd 100644
--- a/include/configs/idmr.h
+++ b/include/configs/idmr.h
@@ -235,8 +235,8 @@
"2m(rootfs)," \
"-(user)";
-#if (CONFIG_COMMANDS & CFG_CMD_MII)
-#error MII commands don't work on iDMR board and sholud not be enabled.
-#endif /* (CONFIG_COMMANDS & CFG_CMD_MII) */
+#if defined(CONFIG_CMD_MII)
+#error "MII commands don't work on iDMR board and should not be enabled."
+#endif
#endif /* _IDMR_H */