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/netta/netta.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/netta/netta.c')
-rw-r--r-- | board/netta/netta.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/netta/netta.c b/board/netta/netta.c index 4923e3a..11a6d56 100644 --- a/board/netta/netta.c +++ b/board/netta/netta.c @@ -555,7 +555,7 @@ int board_early_init_f(void) return 0; } -#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) +#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && defined(CFG_NAND_LEGACY) #include <linux/mtd/nand_legacy.h> @@ -570,7 +570,7 @@ void nand_init(void) } #endif -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) int pcmcia_init(void) { |