drivers/[n-z]*: Remove obsolete references to CONFIG_COMMANDS

PATCH New Jon Loeliger 1 participant 1 message Jul 10, 2007

lore

Share & tools

lore

Jon Loeliger

author

2007-07-10 03:47 UTC #0 lore raw

PATCH 8/30 drivers/[n-z]*: Remove obsolete references to CONFIG_COMMANDS

Signed-off-by Jon Loeliger <[email protected]>

---
 drivers/nand/nand.c               |    2 +-
 drivers/nand/nand_base.c          |    2 +-
 drivers/nand/nand_bbt.c           |    2 +-
 drivers/nand/nand_ecc.c           |    4 ++--
 drivers/nand/nand_ids.c           |    2 +-
 drivers/nand/nand_util.c          |    4 ++--
 drivers/nand_legacy/nand_legacy.c |    4 ++--
 drivers/natsemi.c                 |    2 +-
 drivers/netarm_eth.c              |    2 +-
 drivers/ns8382x.c                 |    2 +-
 drivers/pcnet.c                   |    2 +-
 drivers/plb2800_eth.c             |    2 +-
 drivers/pxa_pcmcia.c              |    2 +-
 drivers/rpx_pcmcia.c              |    8 ++++----
 drivers/rtl8019.c                 |    2 +-
 drivers/rtl8139.c                 |    2 +-
 drivers/rtl8169.c                 |    2 +-
 drivers/sk98lin/uboot_drv.c       |    2 +-
 drivers/sym53c8xx.c               |    4 ++--
 drivers/ti_pci1410a.c             |    2 +-
 drivers/tigon3.c                  |    2 +-
 drivers/tqm8xx_pcmcia.c           |    6 +++---
 drivers/tsec.c                    |    7 +++----
 drivers/tsi108_eth.c              |    2 +-
 drivers/tsi108_i2c.c              |    4 ++--
 25 files changed, 37 insertions(+), 38 deletions(-)

drivers/nand/nand.c +1 -1

index 104a416..27b5792 100644
@@ -23,7 +23,7 @@
 
 #include <common.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && !defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
 
 #include <nand.h>

drivers/nand/nand_base.c +1 -1

index 2e53076..151f535 100644
@@ -72,7 +72,7 @@
 
 #include <common.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && !defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
 
 #include <malloc.h>
 #include <watchdog.h>

drivers/nand/nand_bbt.c +1 -1

index 13ea97e..19a9bc2 100644
@@ -54,7 +54,7 @@
 
 #include <common.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && !defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
 
 #include <malloc.h>
 #include <linux/mtd/compat.h>

drivers/nand/nand_ecc.c +2 -2

index 8b39e2a..4c532b0 100644
@@ -37,7 +37,7 @@
 
 #include <common.h>
 
-#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/mtd.h>

@@ -197,4 +197,4 @@ int nand_correct_data(struct mtd_info *mtd, u_char *dat,
 	return -1;
 }
 
-#endif	/* CONFIG_COMMANDS & CFG_CMD_NAND */
+#endif

drivers/nand/nand_ids.c +1 -1

index 5b944a5..075cae6 100644
@@ -13,7 +13,7 @@
 
 #include <common.h>
 
-#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.h>

drivers/nand/nand_util.c +2 -2

index 135e3c4..88c1df6 100644
@@ -32,7 +32,7 @@
 
 #include <common.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)) && !defined(CFG_NAND_LEGACY)
+#if defined(CONFIG_CMD_NAND) && !defined(CFG_NAND_LEGACY)
 
 #include <command.h>
 #include <watchdog.h>

@@ -859,4 +859,4 @@ int nand_unlock(nand_info_t *meminfo, ulong start, ulong length)
 	return ret;
 }
 
-#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) && !defined(CFG_NAND_LEGACY) */
+#endif

drivers/nand_legacy/nand_legacy.c +2 -2

index 18b4e45..fcb6d2b 100644
@@ -22,7 +22,7 @@
 # define SHOW_BOOT_PROGRESS(arg)
 #endif
 
-#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>
 #include <linux/mtd/nand_ids.h>

@@ -1616,4 +1616,4 @@ int read_jffs2_nand(size_t start, size_t len,
 }
 #endif /* CONFIG_JFFS2_NAND */
 
-#endif /* (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY) */
+#endif

drivers/natsemi.c +1 -1

index 6e0e73f..075d6c5 100644
@@ -56,7 +56,7 @@
 #include <asm/io.h>
 #include <pci.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+#if defined(CONFIG_CMD_NET) \
 	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_NATSEMI)
 
 /* defines */

drivers/netarm_eth.c +1 -1

index 913e89b..a99ee5d 100644
@@ -30,7 +30,7 @@
 #include <asm/arch/netarm_registers.h>
 
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
 
 static int na_mii_poll_busy (void);

drivers/ns8382x.c +1 -1

index 69002cd..f8b143a 100644
@@ -56,7 +56,7 @@
 #include <asm/io.h>
 #include <pci.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+#if defined(CONFIG_CMD_NET) \
 	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_NS8382X)
 
 /* defines */

drivers/pcnet.c +1 -1

index 24fc642..2af0e8f 100644
@@ -45,7 +45,7 @@
 #define PCNET_DEBUG2(fmt,args...)
 #endif
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET)  || defined(CONFIG_CMD_NET)) \
+#if defined(CONFIG_CMD_NET) \
 	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_PCNET)
 
 #if !defined(CONF_PCNET_79C973) && defined(CONF_PCNET_79C975)

drivers/plb2800_eth.c +1 -1

index 770f31b..0ae5d80 100644
@@ -25,7 +25,7 @@
 
 #include <common.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+#if defined(CONFIG_CMD_NET) \
 	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_PLB2800_ETHER)
 
 #include <malloc.h>

drivers/pxa_pcmcia.c +1 -1

index ecadd45..6020e46 100644
@@ -85,7 +85,7 @@ int pcmcia_on (void)
 	return rc;
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
 int pcmcia_off (void)
 {
 	return 0;

drivers/rpx_pcmcia.c +4 -4

index 530525d..c7c425b 100644
@@ -9,11 +9,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

@@ -62,12 +62,12 @@ int pcmcia_hardware_enable (int slot)
 	return 0;	/* No hardware to enable */
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
+#if defined(CONFIG_CMD_PCMCIA)
 static int pcmcia_hardware_disable(int slot)
 {
 	return 0;	/* No hardware to disable */
 }
-#endif	/* CONFIG_COMMANDS & CFG_CMD_PCMCIA */
+#endif
 
 
 #endif	/* CONFIG_PCMCIA && (CONFIG_RPXCLASSIC || CONFIG_RPXLITE) */

drivers/rtl8019.c +1 -1

index 31462b3..409a69f 100644
@@ -34,7 +34,7 @@
 
 #ifdef CONFIG_DRIVER_RTL8019
 
-#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
+#if defined(CONFIG_CMD_NET)
 
 
 /* packet page register access functions */

drivers/rtl8139.c +1 -1

index 31ed855..4954cd0 100644
@@ -77,7 +77,7 @@
 #include <asm/io.h>
 #include <pci.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) && \
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_RTL8139)
 
 #define TICKS_PER_SEC	CFG_HZ

drivers/rtl8169.c +1 -1

index 1810850..63ea2cc 100644
@@ -55,7 +55,7 @@
 #include <asm/io.h>
 #include <pci.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) && \
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_RTL8169)
 
 #undef DEBUG_RTL8169

drivers/sk98lin/uboot_drv.c +1 -1

index ff06ab3..d02cd1b 100644
@@ -25,7 +25,7 @@
 
 #include <common.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) && \
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_SK98)
 
 #include "h/skdrv1st.h"

drivers/sym53c8xx.c +2 -2

index f2c94dd..29eeccd 100644
@@ -51,7 +51,7 @@
 #define PRINTF(fmt,args...)
 #endif
 
-#if ((CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)) && defined(CONFIG_SCSI_SYM53C8XX)
+#if defined(CONFIG_CMD_SCSI) && defined(CONFIG_SCSI_SYM53C8XX)
 
 #undef SCSI_SINGLE_STEP
 /*

@@ -787,7 +787,7 @@ void scsi_chip_init(void)
 	scsi_write_byte(DMODE,0x00);
 #endif
 }
-#endif /* (CONFIG_COMMANDS & CFG_CMD_SCSI) */
+#endif
 
 
 #endif /* CONFIG_SCSI_SYM53C8XX */

drivers/ti_pci1410a.c +1 -1

index d5808e5..208ca50 100644
@@ -64,7 +64,7 @@
 
 #include <pcmcia.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)) && defined(CONFIG_IDE_TI_CARDBUS)
+#if defined(CONFIG_CMD_PCMCIA) && defined(CONFIG_IDE_TI_CARDBUS)
 
 int pcmcia_on(int ide_base_bus);

drivers/tigon3.c +1 -1

index a6a4989..7506a67 100644
@@ -12,7 +12,7 @@
 /******************************************************************************/
 #include <common.h>
 #include <asm/types.h>
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && !defined(CONFIG_NET_MULTI) && \
+#if defined(CONFIG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_TIGON3)
 #ifdef CONFIG_BMW
 #include <mpc824x.h>

drivers/tqm8xx_pcmcia.c +3 -3

index 1dcefaa..ce4b006 100644
@@ -10,11 +10,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

@@ -241,7 +241,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)
 {
 	u_long reg;

drivers/tsec.c +3 -4

index e717cd7..55334d6 100644
@@ -176,7 +176,7 @@ int tsec_initialize(bd_t * bis, int index, char *devname)
 	priv->regs->maccfg1 |= MACCFG1_SOFT_RESET;
 	priv->regs->maccfg1 &= ~(MACCFG1_SOFT_RESET);
 
-#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) \
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) \
 	&& !defined(BITBANGMII)
 	miiphy_register(dev->name, tsec_miiphy_read, tsec_miiphy_write);
 #endif

@@ -1443,7 +1443,7 @@ static void relocate_cmds(void)
 	relocated = 1;
 }
 
-#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) \
+#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) \
 	&& !defined(BITBANGMII)
 
 struct tsec_private *get_priv_for_phy(unsigned char phyaddr)

@@ -1502,7 +1502,6 @@ static int tsec_miiphy_write(char *devname, unsigned char addr,
 	return 0;
 }
 
-#endif /* defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
-		&& !defined(BITBANGMII) */
+#endif
 
 #endif /* CONFIG_TSEC_ENET */

drivers/tsi108_eth.c +1 -1

index a25728e..524e9da 100644
@@ -27,7 +27,7 @@
 
 #include <config.h>
 
-#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) \
+#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) \
 	&& defined(CONFIG_TSI108_ETH)
 
 #if !defined(CONFIG_TSI108_ETH_NUM_PORTS) || (CONFIG_TSI108_ETH_NUM_PORTS > 2)

drivers/tsi108_i2c.c +2 -2

index 2c90eed..3a3b75c 100644
@@ -28,7 +28,7 @@
 #ifdef CONFIG_TSI108_I2C
 #include <tsi108.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
+#if defined(CONFIG_CMD_I2C)
 
 #define I2C_DELAY	100000
 #undef  DEBUG_I2C

@@ -279,5 +279,5 @@ int i2c_probe (uchar chip)
 	return i2c_read (chip, 0, 1, (char *)&tmp, 1);
 }
 
-#endif	/* (CONFIG_COMMANDS & CFG_CMD_I2C) */
+#endif
 #endif /* CONFIG_TSI108_I2C */

Signature · 1 line

1.5.2.2.249.g45fd