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

board/[f-l]*: Remove obsolete references to CONFIG_COMMANDS

Browse Source 
Signed-off-by: Jon Loeliger <jdl@freescale.com>
master
Jon Loeliger 18 years ago
parent b9307262f8
commit c508a4cefd
17 changed files with 34 additions and 34 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
      board/fads/fads.c
  2. 6
      board/fads/fads.h
  3. 8
      board/fads/pcmcia.c
  4. 2
      board/funkwerk/vovpn-gw/m88e6060.c
  5. 4
      board/funkwerk/vovpn-gw/vovpn-gw.c
  6. 4
      board/g2000/g2000.c
  7. 4
      board/gen860t/gen860t.c
  8. 2
      board/genietv/genietv.c
  9. 6
      board/gth/pcmcia.c
  10. 2
      board/hymod/bsp.c
  11. 6
      board/icu862/pcmcia.c
  12. 2
      board/ids8247/ids8247.c
  13. 2
      board/ixdp425/ixdp425.c
  14. 4
      board/kb9202/kb9202.c
  15. 6
      board/kup/common/pcmcia.c
  16. 2
      board/lwmon/lwmon.c
  17. 6
      board/lwmon/pcmcia.c

2
board/fads/fads.c
Unescape View File

@ -778,7 +778,7 @@ int checkboard (void)
/* ========================================================================= */
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#if defined(CONFIG_CMD_PCMCIA)
#ifdef CFG_PCMCIA_MEM_ADDR
volatile unsigned char *pcmcia_mem = (unsigned char*)CFG_PCMCIA_MEM_ADDR;

6
board/fads/fads.h
Unescape View File

@ -120,7 +120,7 @@
#define CFG_HUSH_PARSER
#define CFG_PROMPT_HUSH_PS2 "> "
#define CFG_LONGHELP /* #undef to save memory */
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
#if defined(CONFIG_CMD_KGDB)
#define CFG_CBSIZE 1024 /* Console I/O Buffer Size */
#else
#define CFG_CBSIZE 256 /* Console I/O Buffer Size */
@ -219,7 +219,7 @@
#define CFG_DIRECT_FLASH_TFTP
#if (CONFIG_COMMANDS & CFG_CMD_JFFS2) || defined(CONFIG_CMD_JFFS2)
#if defined(CONFIG_CMD_JFFS2)
/*
* JFFS2 partitions
@ -251,7 +251,7 @@
/*-----------------------------------------------------------------------
* I2C configuration
*/
#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
#if defined(CONFIG_CMD_I2C)
#define CONFIG_HARD_I2C 1 /* I2C with hardware support */
#define CFG_I2C_SPEED 400000 /* I2C speed and slave address defaults */
#define CFG_I2C_SLAVE 0x7F

8
board/fads/pcmcia.c
Unescape View File

@ -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
@ -73,12 +73,12 @@ int pcmcia_hardware_enable(int slot)
return 0;
}
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#if defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
*((uint *)BCSR1) &= ~BCSR1_PCCEN;
return 0;
}
#endif /* CFG_CMD_PCMCIA */
#endif
#endif /* CONFIG_PCMCIA */

2
board/funkwerk/vovpn-gw/m88e6060.c
Unescape View File

@ -31,7 +31,7 @@
#include "m88e6060.h"
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
#if defined(CONFIG_CMD_NET)
static int prtTab[M88X_PRT_CNT] = { 8, 9, 10, 11, 12, 13 };
static int phyTab[M88X_PHY_CNT] = { 0, 1, 2, 3, 4 };

4
board/funkwerk/vovpn-gw/vovpn-gw.c
Unescape View File

@ -184,7 +184,7 @@ const iop_conf_t iop_conf_tab[4][32] = {
void reset_phy (void)
{
volatile ioport_t *iop;
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
#if defined(CONFIG_CMD_NET)
int i;
unsigned short val;
#endif
@ -193,7 +193,7 @@ void reset_phy (void)
/* Reset the PHY */
iop->pdat &= 0xfff7ffff; /* PA12 = |SWITCH_RESET */
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
#if defined(CONFIG_CMD_NET)
udelay(20000);
iop->pdat |= 0x00080000;
for (i=0; i<100; i++) {

4
board/g2000/g2000.c
Unescape View File

@ -73,7 +73,7 @@ int misc_init_f (void)
int misc_init_r (void)
{
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#if defined(CONFIG_CMD_NAND)
/*
* Set NAND-FLASH GPIO signals to default
*/
@ -184,7 +184,7 @@ int testdram (void)
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#if defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];

4
board/gen860t/gen860t.c
Unescape View File

@ -222,7 +222,7 @@ long int initdram (int board_type)
* Disk On Chip (DOC) Millenium initialization.
* The DOC lives in the CS2* space
*/
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
#if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
void doc_init (void)
@ -250,7 +250,7 @@ int misc_init_r (void)
config_mpc8xx_ioports (immr);
#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)
#if defined(CONFIG_CMD_MII)
mii_init ();
#endif

2
board/genietv/genietv.c
Unescape View File

@ -267,7 +267,7 @@ static long int dram_size (long int mbmr_value, long int *base,
return (size);
}
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#if defined(CONFIG_CMD_PCMCIA)
#ifdef CFG_PCMCIA_MEM_ADDR
volatile unsigned char *pcmcia_mem = (unsigned char *) CFG_PCMCIA_MEM_ADDR;

6
board/gth/pcmcia.c
Unescape View File

@ -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
@ -83,7 +83,7 @@ int pcmcia_hardware_enable (int slot)
return 0;
}
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#if defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
return 0; /* No hardware to disable */

2
board/hymod/bsp.c
Unescape View File

@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;
* Board Special Commands: FPGA load/store, EEPROM erase
*/
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
#if defined(CONFIG_CMD_BSP)
#define LOAD_SUCCESS 0
#define LOAD_FAIL_NOCONF 1

6
board/icu862/pcmcia.c
Unescape View File

@ -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
@ -155,7 +155,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;

2
board/ids8247/ids8247.c
Unescape View File

@ -300,7 +300,7 @@ int misc_init_r (void)
gd->bd->bi_flashstart = 0xff800000;
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#if defined(CONFIG_CMD_NAND)
extern ulong
nand_probe (ulong physadr);

2
board/ixdp425/ixdp425.c
Unescape View File

@ -112,7 +112,7 @@ int dram_init (void)
return (0);
}
#if (CONFIG_COMMANDS & CFG_CMD_PCI) || defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
extern struct pci_controller hose;
extern void pci_ixp_init(struct pci_controller * hose);

4
board/kb9202/kb9202.c
Unescape View File

@ -65,7 +65,7 @@ int dram_init (void)
}
#ifdef CONFIG_DRIVER_ETHER
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
#if defined(CONFIG_CMD_NET)
unsigned int lxt972_IsPhyConnected (AT91PS_EMAC p_mac);
UCHAR lxt972_GetLinkSpeed (AT91PS_EMAC p_mac);
@ -90,5 +90,5 @@ void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops)
p_phyops->AutoNegotiate = lxt972_AutoNegotiate;
}
#endif /* CONFIG_COMMANDS & CFG_CMD_NET */
#endif
#endif /* CONFIG_DRIVER_ETHER */

6
board/kup/common/pcmcia.c
Unescape View File

@ -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
@ -115,7 +115,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;

2
board/lwmon/lwmon.c
Unescape View File

@ -761,7 +761,7 @@ static uchar *key_match (uchar *kbd_data)
/*---------------Board Special Commands: PIC read/write ---------------*/
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
#if defined(CONFIG_CMD_BSP)
/***********************************************************************
F* Function: int do_pic (cmd_tbl_t *cmdtp, int flag,
F* int argc, char *argv[]) P*A*Z*

6
board/lwmon/pcmcia.c
Unescape View File

@ -5,11 +5,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
@ -127,7 +127,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;

Write Preview
Loading…
Cancel
Save