diff options
| author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:03:23 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:35:03 +0200 |
| commit | 9107ebe0d352420895ab69b715697bdebc8caf50 (patch) | |
| tree | 9efe29c62f6f389028ea497a2a9f9b4450b780e3 /board/r360mpi/pcmcia.c | |
| parent | 5e378003d592ea828ec69d6defcd4de79096dd5c (diff) | |
| download | u-boot-imx-9107ebe0d352420895ab69b715697bdebc8caf50.zip u-boot-imx-9107ebe0d352420895ab69b715697bdebc8caf50.tar.gz u-boot-imx-9107ebe0d352420895ab69b715697bdebc8caf50.tar.bz2 | |
board/[k-z]*: 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/r360mpi/pcmcia.c')
| -rw-r--r-- | board/r360mpi/pcmcia.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/board/r360mpi/pcmcia.c b/board/r360mpi/pcmcia.c index 7d34ac8..0b40001 100644 --- a/board/r360mpi/pcmcia.c +++ b/board/r360mpi/pcmcia.c @@ -4,11 +4,11 @@ #undef CONFIG_PCMCIA -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #define CONFIG_PCMCIA #endif -#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD) +#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD) #define CONFIG_PCMCIA #endif @@ -123,7 +123,7 @@ int pcmcia_hardware_enable(int slot) } -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_hardware_disable(int slot) { volatile immap_t *immap; |