diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c
index 7686080f35125662c548381e4d7dcdec15153035..ef15a006cd19af522fd51b311c3dfeeecddf9550 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 c768fc8a40943ff783e2179383b93991430e4ae5..119a19d8971d8f6419408c771352df430b5e29b9 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 3ec4a79440fea522723995a0e2f3f580d3b616ff..404e88a4fcde235f8921d72d16bb9380c41e743d 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 */