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/tsec.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/tsec.c')
| -rw-r--r-- | drivers/tsec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tsec.c b/drivers/tsec.c index 1298478..e717cd7 100644 --- a/drivers/tsec.c +++ b/drivers/tsec.c @@ -176,7 +176,7 @@ int tsec_initialize(bd_t * bis, int index, char *devname) priv->regs->maccfg1 |= MACCFG1_SOFT_RESET; priv->regs->maccfg1 &= ~(MACCFG1_SOFT_RESET); -#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) \ +#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) \ && !defined(BITBANGMII) miiphy_register(dev->name, tsec_miiphy_read, tsec_miiphy_write); #endif @@ -1443,7 +1443,7 @@ static void relocate_cmds(void) relocated = 1; } -#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) \ +#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) \ && !defined(BITBANGMII) struct tsec_private *get_priv_for_phy(unsigned char phyaddr) |