summaryrefslogtreecommitdiff
path: root/drivers/macb.c
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-09 17:30:01 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-09 17:30:23 -0500
commit07d38a17e964aec4c7827f0ee9a583bc8cc1ad6b (patch)
treee4535601a24564fe1ee0cd1b9ecd08f0b40ada11 /drivers/macb.c
parentcde5c64d17cf4834aa7b5c373f288bc7dad27b29 (diff)
downloadu-boot-imx-07d38a17e964aec4c7827f0ee9a583bc8cc1ad6b.zip
u-boot-imx-07d38a17e964aec4c7827f0ee9a583bc8cc1ad6b.tar.gz
u-boot-imx-07d38a17e964aec4c7827f0ee9a583bc8cc1ad6b.tar.bz2
drivers/[a-m]*: Remove obsolete references to CONFIG_COMMANDS
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'drivers/macb.c')
-rw-r--r--drivers/macb.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/macb.c b/drivers/macb.c
index 251a029..ffb5f74 100644
--- a/drivers/macb.c
+++ b/drivers/macb.c
@@ -18,8 +18,7 @@
#include <common.h>
#if defined(CONFIG_MACB) \
- && ((CONFIG_COMMANDS & (CFG_CMD_NET | CFG_CMD_MII)) \
- || (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)))
+ && (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)))
/*
* The u-boot networking stack is a little weird. It seems like the
@@ -165,7 +164,7 @@ static u16 macb_mdio_read(struct macb_device *macb, u8 reg)
return MACB_BFEXT(DATA, frame);
}
-#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
static int macb_send(struct eth_device *netdev, volatile void *packet,
int length)
@@ -494,9 +493,9 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)
return 0;
}
-#endif /* (CONFIG_COMMANDS & CFG_CMD_NET) */
+#endif
-#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)
+#if defined(CONFIG_CMD_MII)
int miiphy_read(unsigned char addr, unsigned char reg, unsigned short *value)
{
@@ -572,6 +571,6 @@ int miiphy_write(unsigned char addr, unsigned char reg, unsigned short value)
return 0;
}
-#endif /* (CONFIG_COMMANDS & CFG_CMD_MII) */
+#endif
#endif /* CONFIG_MACB */