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 <jdl@freescale.com>
master
Jon Loeliger 18 years ago committed by Wolfgang Denk
parent 5e378003d5
commit 9107ebe0d3
  1. 2
      board/kb9202/kb9202.c
  2. 6
      board/kup/common/pcmcia.c
  3. 2
      board/lwmon/lwmon.c
  4. 6
      board/lwmon/pcmcia.c
  5. 6
      board/mbx8xx/pcmcia.c
  6. 2
      board/mcc200/auto_update.c
  7. 2
      board/mcc200/mcc200.c
  8. 2
      board/ml2/serial.c
  9. 2
      board/mp2usb/mp2usb.c
  10. 4
      board/mpl/common/common_util.c
  11. 2
      board/mpl/common/common_util.h
  12. 2
      board/mpl/vcma9/vcma9.c
  13. 2
      board/mpl/vcma9/vcma9.h
  14. 2
      board/nc650/nand.c
  15. 2
      board/netphone/netphone.c
  16. 2
      board/netstar/nand.c
  17. 4
      board/netta/netta.c
  18. 6
      board/netta/pcmcia.c
  19. 2
      board/netta2/netta2.c
  20. 2
      board/netvia/netvia.c
  21. 4
      board/omap2420h4/omap2420h4.c
  22. 2
      board/pcippc2/pcippc2.c
  23. 2
      board/pm520/pm520.c
  24. 2
      board/pm826/pm826.c
  25. 2
      board/pm828/pm828.c
  26. 2
      board/pn62/cmd_pn62.c
  27. 2
      board/prodrive/alpr/nand.c
  28. 2
      board/prodrive/p3mx/serial.c
  29. 2
      board/prodrive/pdnb3/nand.c
  30. 2
      board/prodrive/pdnb3/pdnb3.c
  31. 6
      board/r360mpi/pcmcia.c
  32. 2
      board/sacsng/sacsng.c
  33. 4
      board/sbc2410x/sbc2410x.c
  34. 2
      board/sc3/sc3nand.c
  35. 2
      board/siemens/common/fpga.c
  36. 2
      board/siemens/pcu_e/pcu_e.c
  37. 6
      board/sixnet/sixnet.c
  38. 2
      board/ssv/adnpesc1/adnpesc1.c
  39. 2
      board/ssv/common/cmd_sled.c
  40. 2
      board/ssv/common/wd_pio.c
  41. 2
      board/stxxtc/stxxtc.c
  42. 2
      board/svm_sc8xx/svm_sc8xx.c
  43. 2
      board/tqm5200/cmd_stk52xx.c
  44. 2
      board/tqm5200/cmd_tb5200.c
  45. 2
      board/tqm8272/tqm8272.c
  46. 2
      board/trab/auto_update.c
  47. 6
      board/trab/cmd_trab.c
  48. 12
      board/trab/trab_fkt.c
  49. 6
      board/uc100/pcmcia.c
  50. 2
      board/w7o/cmd_vpd.c
  51. 2
      board/xilinx/ml300/serial.c
  52. 2
      board/zylonite/nand.c

@ -65,7 +65,7 @@ int dram_init (void)
}
#ifdef CONFIG_DRIVER_ETHER
#if (CONFIG_COMMANDS & CFG_CMD_NET)
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
unsigned int lxt972_IsPhyConnected (AT91PS_EMAC p_mac);
UCHAR lxt972_GetLinkSpeed (AT91PS_EMAC p_mac);

@ -4,11 +4,11 @@
#undef CONFIG_PCMCIA
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || 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)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
volatile immap_t *immap;

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

@ -5,11 +5,11 @@
#undef CONFIG_PCMCIA
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || 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)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
volatile immap_t *immap;

@ -6,11 +6,11 @@
#undef CONFIG_PCMCIA
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD)
#define CONFIG_PCMCIA
#endif
@ -156,7 +156,7 @@ int pcmcia_hardware_enable (int slot)
return (0);
}
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable (int slot)
{
return 0; /* No hardware to disable */

@ -44,7 +44,7 @@
#error "must define CFG_HUSH_PARSER"
#endif
#if !(CONFIG_COMMANDS & CFG_CMD_FAT)
#if !((CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT))
#error "must define CFG_CMD_FAT"
#endif

@ -322,7 +322,7 @@ void ide_set_reset (int idereset)
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
void doc_init (void)
{

@ -88,7 +88,7 @@ void serial_puts (const char *s)
}
}
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void)
{
}

@ -61,7 +61,7 @@ int dram_init (void)
}
#ifdef CONFIG_DRIVER_ETHER
#if (CONFIG_COMMANDS & CFG_CMD_NET)
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)
/*
* Name:

@ -471,7 +471,7 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
if (strcmp(argv[1], "flash") == 0)
{
#if (CONFIG_COMMANDS & CFG_CMD_FDC)
#if (CONFIG_COMMANDS & CFG_CMD_FDC) || defined(CONFIG_CMD_FDC)
if (strcmp(argv[2], "floppy") == 0) {
char *local_args[3];
extern int do_fdcboot (cmd_tbl_t *, int, int, char *[]);
@ -564,7 +564,7 @@ int do_mplcommon(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
}
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
extern void doc_probe(ulong physadr);
void doc_init (void)
{

@ -39,7 +39,7 @@ void get_backup_values(backup_t *buf);
void show_stdio_dev(void);
void check_env(void);
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
void doc_init (void);
#endif

@ -132,7 +132,7 @@ int board_init(void)
/*
* NAND flash initialization.
*/
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
extern ulong
nand_probe(ulong physadr);

@ -31,7 +31,7 @@ extern int mem_test(unsigned long start, unsigned long ramsize,int mode);
void print_vcma9_info(void);
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
typedef enum {
NFCE_LOW,
NFCE_HIGH

@ -24,7 +24,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <nand.h>

@ -597,7 +597,7 @@ int board_early_init_f(void)
return 0;
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>

@ -22,7 +22,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <nand.h>

@ -555,7 +555,7 @@ int board_early_init_f(void)
return 0;
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND) && defined(CFG_NAND_LEGACY)
#if ((CONFIG_COMMANDS & CFG_CMD_NAND) || 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)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
int pcmcia_init(void)
{

@ -4,11 +4,11 @@
#undef CONFIG_PCMCIA
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || 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)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
volatile immap_t *immap;

@ -595,7 +595,7 @@ int board_early_init_f(void)
return 0;
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>

@ -416,7 +416,7 @@ int board_early_init_f(void)
return 0;
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>

@ -31,7 +31,7 @@
#include <asm/arch/mem.h>
#include <i2c.h>
#include <asm/mach-types.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>
extern struct nand_chip nand_dev_desc[CFG_MAX_NAND_DEVICE];
#endif
@ -847,7 +847,7 @@ void update_mux(u32 btype,u32 mtype)
}
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
void nand_init(void)
{
extern flash_info_t flash_info[];

@ -202,7 +202,7 @@ void watchdog_reset (void)
enable_interrupts ();
}
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
switch (argc) {

@ -314,7 +314,7 @@ void ide_set_reset (int idereset)
}
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
void doc_init (void)
{

@ -310,7 +310,7 @@ long int initdram (int board_type)
return (psize);
}
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
void doc_init (void)
{

@ -343,7 +343,7 @@ long int initdram (int board_type)
return (psize);
}
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
void doc_init (void)
{

@ -29,7 +29,7 @@
#include <command.h>
#include "pn62.h"
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);

@ -26,7 +26,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <asm/processor.h>
#include <nand.h>

@ -80,7 +80,7 @@ void serial_puts (const char *s)
}
}
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
void kgdb_serial_init (void)
{
}

@ -23,7 +23,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <nand.h>

@ -236,7 +236,7 @@ U_BOOT_CMD(
"address size\n - boot FPGA with gzipped image at <address>\n"
);
#if (CONFIG_COMMANDS & CFG_CMD_PCI) || defined(CONFIG_PCI)
#if (CONFIG_COMMANDS & CFG_CMD_PCI) || defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
extern struct pci_controller hose;
extern void pci_ixp_init(struct pci_controller * hose);

@ -4,11 +4,11 @@
#undef CONFIG_PCMCIA
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD)
#define CONFIG_PCMCIA
#endif
@ -123,7 +123,7 @@ int pcmcia_hardware_enable(int slot)
}
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
volatile immap_t *immap;

@ -837,7 +837,7 @@ void show_boot_progress (int status)
/*
* The following are used to control the SPI chip selects for the SPI command.
*/
#if (CONFIG_COMMANDS & CFG_CMD_SPI)
#if (CONFIG_COMMANDS & CFG_CMD_SPI) || defined(CONFIG_CMD_SPI)
#define SPI_ADC_CS_MASK 0x00000800
#define SPI_DAC_CS_MASK 0x00001000

@ -31,7 +31,7 @@
#include <common.h>
#include <s3c2410.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand.h>
#endif
@ -136,7 +136,7 @@ int dram_init (void)
return 0;
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
extern ulong nand_probe(ulong physadr);
static inline void NF_Reset(void)

@ -23,7 +23,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <nand.h>
#include <asm/processor.h>

@ -219,7 +219,7 @@ static int fpga_load (fpga_t* fpga, ulong addr, int checkall)
return 1;
}
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
/* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */

@ -368,7 +368,7 @@ void reset_phy (void)
/*-----------------------------------------------------------------------
* Board Special Commands: access functions for "PUMA" FPGA
*/
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
#define PUMA_READ_MODE 0
#define PUMA_LOAD_MODE 1

@ -33,7 +33,7 @@
# include <status_led.h>
#endif
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>
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);

@ -65,7 +65,7 @@ long int initdram (int board_type)
/*
* The following are used to control the SPI chip selects for the SPI command.
*/
#if (CONFIG_COMMANDS & CFG_CMD_SPI) && CONFIG_NIOS_SPI
#if ((CONFIG_COMMANDS & CFG_CMD_SPI) || defined(CONFIG_CMD_SPI)) && CONFIG_NIOS_SPI
#define SPI_RTC_CS_MASK 0x00000001

@ -46,7 +46,7 @@ typedef struct {
extern led_dev_t led_dev[];
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
{
int led_id = 0;

@ -112,7 +112,7 @@ void hw_watchdog_reset(void)
enable_interrupts ();
}
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
int do_wd (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
nios_pio_t *ena_piop = (nios_pio_t*)CONFIG_HW_WDENA_BASE;

@ -574,7 +574,7 @@ int board_early_init_f(void)
return 0;
}
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <linux/mtd/nand_legacy.h>

@ -153,7 +153,7 @@ long int initdram (int board_type)
return (size_b0 );
}
#if (CONFIG_COMMANDS & CFG_CMD_DOC)
#if (CONFIG_COMMANDS & CFG_CMD_DOC) || defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr);
void doc_init (void)
{

@ -29,7 +29,7 @@
#include <common.h>
#include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
#if defined(CONFIG_STK52XX) || defined(CONFIG_FO300)
#define DEFAULT_VOL 45

@ -29,7 +29,7 @@
#include <common.h>
#include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
#if defined (CONFIG_TB5200)
#define SM501_PANEL_DISPLAY_CONTROL 0x00080000UL

@ -1065,7 +1065,7 @@ int update_flash_size (int flash_size)
}
#endif
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#include <nand.h>
#include <linux/mtd/mtd.h>

@ -46,7 +46,7 @@
#error "must define CFG_HUSH_PARSER"
#endif
#if !(CONFIG_COMMANDS & CFG_CMD_FAT)
#if !((CONFIG_COMMANDS & CFG_CMD_FAT) || defined(CONFIG_CMD_FAT))
#error "must define CFG_CMD_FAT"
#endif

@ -32,7 +32,7 @@
* TRAB board specific commands. Especially commands for burn-in and function
* test.
*/
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
/* limits for valid range of VCC5V in mV */
#define VCC5V_MIN 4500
@ -846,7 +846,7 @@ int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{
int contact_temp;
int delay = 0;
#if (CONFIG_COMMANDS & CFG_CMD_DATE)
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)
struct rtc_time tm;
#endif
@ -862,7 +862,7 @@ int do_temp_log (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
spi_init ();
while (1) {
#if (CONFIG_COMMANDS & CFG_CMD_DATE)
#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)
rtc_get (&tm);
printf ("%4d-%02d-%02d %2d:%02d:%02d - ",
tm.tm_year, tm.tm_mon, tm.tm_mday,

@ -148,7 +148,7 @@ static int rs485_receive_chars (char *data, int timeout);
static unsigned short updcrc(unsigned short icrc, unsigned char *icp,
unsigned int icnt);
#if (CONFIG_COMMANDS & CFG_CMD_I2C)
#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
static int trab_eeprom_read (char **argv);
static int trab_eeprom_write (char **argv);
int i2c_write_multiple (uchar chip, uint addr, int alen, uchar *buffer,
@ -959,7 +959,7 @@ static int touch_check_pressed (void)
static int touch_write_clibration_values (int calib_point, int x, int y)
{
#if (CONFIG_COMMANDS & CFG_CMD_I2C)
#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
int x_verify = 0;
int y_verify = 0;
@ -1105,7 +1105,7 @@ static int rs485_receive_chars (char *data, int timeout)
int do_serial_number (char **argv)
{
#if (CONFIG_COMMANDS & CFG_CMD_I2C)
#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
unsigned int serial_number;
if (strcmp (argv[2], "read") == 0) {
@ -1139,7 +1139,7 @@ int do_serial_number (char **argv)
int do_crc16 (void)
{
#if (CONFIG_COMMANDS & CFG_CMD_I2C)
#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
int crc;
unsigned char buf[EEPROM_MAX_CRC_BUF];
@ -1260,7 +1260,7 @@ int do_gain (char **argv)
int do_eeprom (char **argv)
{
#if (CONFIG_COMMANDS & CFG_CMD_I2C)
#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
if (strcmp (argv[2], "read") == 0) {
return (trab_eeprom_read (argv));
}
@ -1278,7 +1278,7 @@ int do_eeprom (char **argv)
#endif /* CFG_CMD_I2C */
}
#if (CONFIG_COMMANDS & CFG_CMD_I2C)
#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)
static int trab_eeprom_read (char **argv)
{
int i;

@ -4,11 +4,11 @@
#undef CONFIG_PCMCIA
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA
#endif
#if (CONFIG_COMMANDS & CFG_CMD_IDE) && defined(CONFIG_IDE_8xx_PCCARD)
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || defined(CONFIG_CMD_IDE)) && defined(CONFIG_IDE_8xx_PCCARD)
#define CONFIG_PCMCIA
#endif
@ -123,7 +123,7 @@ int pcmcia_hardware_enable(int slot)
}
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
int pcmcia_hardware_disable(int slot)
{
volatile immap_t *immap;

@ -24,7 +24,7 @@
#include <common.h>
#include <command.h>
#if (CONFIG_COMMANDS & CFG_CMD_BSP)
#if (CONFIG_COMMANDS & CFG_CMD_BSP) || defined(CONFIG_CMD_BSP)
#include "vpd.h"

@ -122,7 +122,7 @@ serial_puts(const char *s)
}
}
#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
#if (CONFIG_COMMANDS & CFG_CMD_KGDB) || defined(CONFIG_CMD_KGDB)
void
kgdb_serial_init(void)
{

@ -22,7 +22,7 @@
#include <common.h>
#if (CONFIG_COMMANDS & CFG_CMD_NAND)
#if (CONFIG_COMMANDS & CFG_CMD_NAND) || defined(CONFIG_CMD_NAND)
#ifdef CONFIG_NEW_NAND_CODE
#include <nand.h>

Loading…
Cancel
Save