diff options
author | Jon Loeliger <jdl@jdl.com> | 2007-06-11 19:03:19 -0500 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-07-04 00:34:58 +0200 |
commit | 5e378003d592ea828ec69d6defcd4de79096dd5c (patch) | |
tree | e3687f00dcedf80e11f84caa3d519684c6843bd8 /board/cpc45 | |
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/cpc45')
-rw-r--r-- | board/cpc45/cpc45.c | 2 | ||||
-rw-r--r-- | board/cpc45/pd67290.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/cpc45/cpc45.c b/board/cpc45/cpc45.c index 51b0085911b..5db7db30039 100644 --- a/board/cpc45/cpc45.c +++ b/board/cpc45/cpc45.c @@ -240,7 +240,7 @@ int sysControlDisplay (int digit, /* number of digit 0..7 */ return (0); } -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #ifdef CFG_PCMCIA_MEM_ADDR volatile unsigned char *pcmcia_mem = (unsigned char*)CFG_PCMCIA_MEM_ADDR; diff --git a/board/cpc45/pd67290.c b/board/cpc45/pd67290.c index 6ca3e7bd7ab..afba0b9ae36 100644 --- a/board/cpc45/pd67290.c +++ b/board/cpc45/pd67290.c @@ -772,7 +772,7 @@ exit: return rc; } -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_off (void) { printf ("Disable PCMCIA " PCMCIA_SLOT_MSG "\n"); |