diff options
author | Jon Loeliger | 2007-06-11 19:03:19 -0500 |
---|---|---|
committer | Wolfgang Denk | 2007-07-04 00:34:58 +0200 |
commit | 5e378003d592ea828ec69d6defcd4de79096dd5c (patch) | |
tree | e3687f00dcedf80e11f84caa3d519684c6843bd8 /board/evb64260/eth.c | |
parent | 737184114ec9c9e0ab94d6713536126073bd2472 (diff) |
board/[Ma-i]*: 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 'board/evb64260/eth.c')
-rw-r--r-- | board/evb64260/eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/evb64260/eth.c b/board/evb64260/eth.c index eafa48bc6ea..2772058f0f6 100644 --- a/board/evb64260/eth.c +++ b/board/evb64260/eth.c @@ -31,7 +31,7 @@ Skeleton NIC driver for Etherboot #include "eth.h" #include "eth_addrtbl.h" -#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) +#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) #define GT6426x_ETH_BUF_SIZE 1536 @@ -797,7 +797,7 @@ gt6426x_eth_initialize(bd_t *bis) eth_register(dev); -#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) +#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) miiphy_register(dev->name, gt6426x_miiphy_read, gt6426x_miiphy_write); #endif |