commit ab77bc547ba561c25ea34457ed17aa0b2f7c2723
author TsiChungLiew <Tsi-Chung.Liew@freescale.com> Wed Aug 15 15:39:17 2007 -0500
committer John Rigby <jrigby@freescale.com> Thu Aug 16 17:43:19 2007 -0600
tree c7e9d3c146f22730638ca0c63f1e6f150bb9a6a2
parent 81735b2568cf634d601c0d4a1bbc3a3882bc8eda

ColdFire: MCF5329 Update and cleanup

Signed-off-by: TsiChungLiew <Tsi-Chung.Liew@freescale.com>

board/freescale/m5329evb/mii.c

diff --git a/board/freescale/m5329evb/mii.c b/board/freescale/m5329evb/mii.c
index 68dc04f..31f1510 100644
--- a/board/freescale/m5329evb/mii.c
+++ b/board/freescale/m5329evb/mii.c
@@ -30,7 +30,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI)
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI)
 #undef MII_DEBUG
 #undef ET_DEBUG
 
@@ -50,7 +50,7 @@
 	return 0;
 }
 
-#if defined(CFG_DISCOVER_PHY) || (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined(CFG_DISCOVER_PHY) || defined(CONFIG_CMD_MII)
 #include <miiphy.h>
 
 /* Make MII read/write commands for the FEC. */
@@ -134,7 +134,7 @@
 
 	return (mii_reply & 0xffff);	/* data read from phy */
 }
-#endif				/* CFG_DISCOVER_PHY || (CONFIG_COMMANDS & CFG_CMD_MII) */
+#endif				/* CFG_DISCOVER_PHY || CONFIG_CMD_MII */
 
 #if defined(CFG_DISCOVER_PHY)
 int mii_discover_phy(struct eth_device *dev)
@@ -303,4 +303,4 @@
 	return 0;
 }
 
-#endif				/* CFG_CMD_NET, FEC_ENET & NET_MULTI */
+#endif				/* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */

board/freescale/m5329evb/nand.c

diff --git a/board/freescale/m5329evb/nand.c b/board/freescale/m5329evb/nand.c
index 2272a24..fefb42e 100644
--- a/board/freescale/m5329evb/nand.c
+++ b/board/freescale/m5329evb/nand.c
@@ -31,7 +31,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#if (CONFIG_COMMANDS & CFG_CMD_NAND)
+#if defined(CONFIG_CMD_NAND)
 #include <nand.h>
 #include <linux/mtd/mtd.h>