summaryrefslogtreecommitdiffstats
path: root/board/netta
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-09 18:38:39 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-09 18:48:09 -0500
commit3fe00109a5f12de55b6e25b1f98dfc24bc9090c9 (patch)
tree064db83c6bcefe2d2b89f3b18a532ec69df221d5 /board/netta
parentc508a4cefd8a953fc64957650506a035e6e3d9d1 (diff)
downloadtalos-obmc-uboot-3fe00109a5f12de55b6e25b1f98dfc24bc9090c9.tar.gz
talos-obmc-uboot-3fe00109a5f12de55b6e25b1f98dfc24bc9090c9.zip
board/[m-p]*: Remove obsolete references to CONFIG_COMMANDS
Signed-off-by: Jon Loeliger <jdl@freescale.com>
Diffstat (limited to 'board/netta')
-rw-r--r--board/netta/netta.c4
-rw-r--r--board/netta/pcmcia.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/board/netta/netta.c b/board/netta/netta.c
index 11a6d56aea..5a75e53e0d 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(CONFIG_CMD_NAND)) && defined(CFG_NAND_LEGACY)
+#if 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) || defined(CONFIG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
int pcmcia_init(void)
{
diff --git a/board/netta/pcmcia.c b/board/netta/pcmcia.c
index 31de064943..693e077b3a 100644
--- a/board/netta/pcmcia.c
+++ b/board/netta/pcmcia.c
@@ -4,11 +4,11 @@
#undef CONFIG_PCMCIA
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
-#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD)
+#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#define CONFIG_PCMCIA
#endif
@@ -264,7 +264,7 @@ int pcmcia_hardware_enable(int slot)
}
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
volatile immap_t *immap;
OpenPOWER on IntegriCloud