Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Jon Loeliger <jdl@freescale.com>
master
Jon Loeliger 18 years ago
parent 07d38a17e9
commit cb51c0bf88
25 changed files with 37 additions and 38 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      drivers/nand/nand.c
  2. 2
      drivers/nand/nand_base.c
  3. 2
      drivers/nand/nand_bbt.c
  4. 4
      drivers/nand/nand_ecc.c
  5. 2
      drivers/nand/nand_ids.c
  6. 4
      drivers/nand/nand_util.c
  7. 4
      drivers/nand_legacy/nand_legacy.c
  8. 2
      drivers/natsemi.c
  9. 2
      drivers/netarm_eth.c
  10. 2
      drivers/ns8382x.c
  11. 2
      drivers/pcnet.c
  12. 2
      drivers/plb2800_eth.c
  13. 2
      drivers/pxa_pcmcia.c
  14. 8
      drivers/rpx_pcmcia.c
  15. 2
      drivers/rtl8019.c
  16. 2
      drivers/rtl8139.c
  17. 2
      drivers/rtl8169.c
  18. 2
      drivers/sk98lin/uboot_drv.c
  19. 4
      drivers/sym53c8xx.c
  20. 2
      drivers/ti_pci1410a.c
  21. 2
      drivers/tigon3.c
  22. 6
      drivers/tqm8xx_pcmcia.c
  23. 7
      drivers/tsec.c
  24. 2
      drivers/tsi108_eth.c
  25. 4
      drivers/tsi108_i2c.c

2
drivers/nand/nand.c
Unescape View File

@ -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>

2
drivers/nand/nand_base.c
Unescape View File

@ -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>

2
drivers/nand/nand_bbt.c
Unescape View File

@ -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>

4
drivers/nand/nand_ecc.c
Unescape View File

@ -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

2
drivers/nand/nand_ids.c
Unescape View File

@ -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>

4
drivers/nand/nand_util.c
Unescape View File

@ -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

4
drivers/nand_legacy/nand_legacy.c
Unescape View File

@ -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

2
drivers/natsemi.c
Unescape View File

@ -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 */

2
drivers/netarm_eth.c
Unescape View File

@ -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);

2
drivers/ns8382x.c
Unescape View File

@ -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 */

2
drivers/pcnet.c
Unescape View File

@ -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)

2
drivers/plb2800_eth.c
Unescape View File

@ -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>

2
drivers/pxa_pcmcia.c
Unescape View File

@ -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;

8
drivers/rpx_pcmcia.c
Unescape View File

@ -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) */

2
drivers/rtl8019.c
Unescape View File

@ -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 */

2
drivers/rtl8139.c
Unescape View File

@ -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

2
drivers/rtl8169.c
Unescape View File

@ -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

2
drivers/sk98lin/uboot_drv.c
Unescape View File

@ -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"

4
drivers/sym53c8xx.c
Unescape View File

@ -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 */

2
drivers/ti_pci1410a.c
Unescape View File

@ -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);

2
drivers/tigon3.c
Unescape View File

@ -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>

6
drivers/tqm8xx_pcmcia.c
Unescape View File

@ -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;

7
drivers/tsec.c
Unescape View File

@ -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 */

2
drivers/tsi108_eth.c
Unescape View File

@ -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)

4
drivers/tsi108_i2c.c
Unescape View File

@ -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 */

Write Preview
Loading…
Cancel
Save