From 9107ebe0d352420895ab69b715697bdebc8caf50 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Mon, 11 Jun 2007 19:03:23 -0500 Subject: 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 --- board/sixnet/sixnet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'board/sixnet/sixnet.c') diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c index a4cb4dcf097..d6a26f44948 100644 --- a/board/sixnet/sixnet.c +++ b/board/sixnet/sixnet.c @@ -33,7 +33,7 @@ # include #endif -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) #include extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE]; #endif @@ -75,7 +75,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) +#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #error "SXNI855T has no PCMCIA port" #endif /* CFG_CMD_PCMCIA */ @@ -327,7 +327,7 @@ int misc_init_r (void) return (0); } -#if (CONFIG_COMMANDS & CFG_CMD_NAND) +#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) void nand_init(void) { unsigned long totlen = nand_probe(CFG_DFLASH_BASE); -- cgit v1.2.3 From ab3abcbabd840928fb1eb5122118ca466b5e5013 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Mon, 9 Jul 2007 18:45:16 -0500 Subject: board/[q-z]*: Remove obsolete references to CONFIG_COMMANDS Signed-off-by: Jon Loeliger --- board/sixnet/sixnet.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'board/sixnet/sixnet.c') diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c index d6a26f44948..41c74f6a67e 100644 --- a/board/sixnet/sixnet.c +++ b/board/sixnet/sixnet.c @@ -33,7 +33,7 @@ # include #endif -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) +#if defined(CONFIG_CMD_NAND) #include extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE]; #endif @@ -75,7 +75,7 @@ int checkboard (void) /* ------------------------------------------------------------------------- */ -#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) +#if defined(CONFIG_CMD_PCMCIA) #error "SXNI855T has no PCMCIA port" #endif /* CFG_CMD_PCMCIA */ @@ -327,7 +327,7 @@ int misc_init_r (void) return (0); } -#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND) +#if defined(CONFIG_CMD_NAND) void nand_init(void) { unsigned long totlen = nand_probe(CFG_DFLASH_BASE); -- cgit v1.2.3 From d39b57415838c73fb0a37eca84de3c68ba990586 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Tue, 10 Jul 2007 10:48:22 -0500 Subject: board/[j-z]*: Remove lingering references to CFG_CMD_* symbols. Fixed some broken instances of "#ifdef CMD_CFG_IDE" too. Those always evaluated TRUE, and thus were always compiled even when IDE really wasn't defined/wanted. Signed-off-by: Jon Loeliger --- board/sixnet/sixnet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board/sixnet/sixnet.c') diff --git a/board/sixnet/sixnet.c b/board/sixnet/sixnet.c index 41c74f6a67e..798e1855bd4 100644 --- a/board/sixnet/sixnet.c +++ b/board/sixnet/sixnet.c @@ -77,7 +77,7 @@ int checkboard (void) #if defined(CONFIG_CMD_PCMCIA) #error "SXNI855T has no PCMCIA port" -#endif /* CFG_CMD_PCMCIA */ +#endif /* ------------------------------------------------------------------------- */ -- cgit v1.2.3