diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:02:10 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:23:11 +0200 |
| commit | d5be43de93ff905c465e509d45a3164ef48d26e7 (patch) | |
| tree | 8adf5e095118afadc4b2f770daad386df1da3f4e /drivers/macb.c | |
| parent | b453960d4fdb87b3970d96119b90df2ed024fc4a (diff) | |
| download | u-boot-imx-d5be43de93ff905c465e509d45a3164ef48d26e7.zip u-boot-imx-d5be43de93ff905c465e509d45a3164ef48d26e7.tar.gz u-boot-imx-d5be43de93ff905c465e509d45a3164ef48d26e7.tar.bz2 | |
drivers/: 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 'drivers/macb.c')
| -rw-r--r-- | drivers/macb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/macb.c b/drivers/macb.c index 186ab19..251a029 100644 --- a/drivers/macb.c +++ b/drivers/macb.c @@ -17,7 +17,9 @@ */ #include <common.h> -#if defined(CONFIG_MACB) && (CONFIG_COMMANDS & (CFG_CMD_NET | CFG_CMD_MII)) +#if defined(CONFIG_MACB) \ + && ((CONFIG_COMMANDS & (CFG_CMD_NET | CFG_CMD_MII)) \ + || (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII))) /* * The u-boot networking stack is a little weird. It seems like the @@ -163,7 +165,7 @@ static u16 macb_mdio_read(struct macb_device *macb, u8 reg) return MACB_BFEXT(DATA, frame); } -#if (CONFIG_COMMANDS & CFG_CMD_NET) +#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) static int macb_send(struct eth_device *netdev, volatile void *packet, int length) @@ -494,7 +496,7 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr) #endif /* (CONFIG_COMMANDS & CFG_CMD_NET) */ -#if (CONFIG_COMMANDS & CFG_CMD_MII) +#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) int miiphy_read(unsigned char addr, unsigned char reg, unsigned short *value) { |