GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board/[j-z]*: Remove lingering references to CFG_CMD_* symbols.

Browse source 
Fixed some broken instances of "#ifdef CMD_CFG_IDE" too.
Those always evaluated TRUE, and thus were always compiled
even when IDE really wasn't defined/wanted.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-07-10 10:48:22 -05:00
parent 77a318545d
commit d39b574158
27 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
board/jupiter/jupiter.c
View file

@ -281,7 +281,7 @@ void pci_init_board(void)
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void) void init_ide_reset (void)
{ {
@ -306,7 +306,7 @@ void ide_set_reset (int idereset)
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4; *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
} }
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP) #if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP)
void void

2
board/kup/common/pcmcia.c
View file

@ -144,7 +144,7 @@ int pcmcia_hardware_disable(int slot)
return (0); return (0);
} }
#endif /* CFG_CMD_PCMCIA */ #endif
int pcmcia_voltage_set(int slot, int vcc, int vpp) int pcmcia_voltage_set(int slot, int vcc, int vpp)

2
board/lwmon/lwmon.c
View file

@ -960,7 +960,7 @@ U_BOOT_CMD(
"lsb - print current setting\n" "lsb - print current setting\n"
); );
#endif /* CFG_CMD_BSP */ #endif
/*----------------------------- Utilities -----------------------------*/ /*----------------------------- Utilities -----------------------------*/
/*********************************************************************** /***********************************************************************

2
board/lwmon/pcmcia.c
View file

@ -166,7 +166,7 @@ int pcmcia_hardware_disable(int slot)
return (0); return (0);
} }
#endif /* CFG_CMD_PCMCIA */ #endif
int pcmcia_voltage_set(int slot, int vcc, int vpp) int pcmcia_voltage_set(int slot, int vcc, int vpp)

2
board/mcc200/auto_update.c
View file

@ -45,7 +45,7 @@
#endif #endif
#if !defined(CONFIG_CMD_FAT) #if !defined(CONFIG_CMD_FAT)
#error "must define CFG_CMD_FAT" #error "must define CONFIG_CMD_FAT"
#endif #endif
#undef AU_DEBUG #undef AU_DEBUG

4
board/mcc200/mcc200.c
View file

@ -307,7 +307,7 @@ void pci_init_board(void)
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void) void init_ide_reset (void)
{ {
@ -320,7 +320,7 @@ void ide_set_reset (int idereset)
debug ("ide_reset(%d)\n", idereset); debug ("ide_reset(%d)\n", idereset);
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif
#if defined(CONFIG_CMD_DOC) #if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr); extern void doc_probe (ulong physadr);

2
board/netta/pcmcia.c
View file

@ -291,7 +291,7 @@ int pcmcia_hardware_disable(int slot)
return (0); return (0);
} }
#endif /* CFG_CMD_PCMCIA */ #endif
int pcmcia_voltage_set(int slot, int vcc, int vpp) int pcmcia_voltage_set(int slot, int vcc, int vpp)

2
board/pcippc2/pcippc2.c
View file

@ -241,5 +241,5 @@ U_BOOT_CMD(
"wd - print current status\n" "wd - print current status\n"
); );
#endif /* CFG_CMD_BSP */ #endif
#endif /* CONFIG_WATCHDOG */ #endif /* CONFIG_WATCHDOG */

4
board/pm520/pm520.c
View file

@ -299,7 +299,7 @@ void pci_init_board(void)
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset (void) void init_ide_reset (void)
{ {
@ -312,7 +312,7 @@ void ide_set_reset (int idereset)
debug ("ide_reset(%d)\n", idereset); debug ("ide_reset(%d)\n", idereset);
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif
#if defined(CONFIG_CMD_DOC) #if defined(CONFIG_CMD_DOC)
extern void doc_probe (ulong physadr); extern void doc_probe (ulong physadr);

2
board/r360mpi/pcmcia.c
View file

@ -150,7 +150,7 @@ int pcmcia_hardware_disable(int slot)
return (0); return (0);
} }
#endif /* CFG_CMD_PCMCIA */ #endif
int pcmcia_voltage_set(int slot, int vcc, int vpp) int pcmcia_voltage_set(int slot, int vcc, int vpp)

2
board/sacsng/sacsng.c
View file

@ -873,7 +873,7 @@ spi_chipsel_type spi_chipsel[] = {
}; };
int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]); int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]);
#endif /* CFG_CMD_SPI */ #endif
#endif /* CONFIG_MISC_INIT_R */ #endif /* CONFIG_MISC_INIT_R */

2
board/siemens/pcu_e/pcu_e.c
View file

@ -408,7 +408,7 @@ U_BOOT_CMD (puma, 4, 1, do_puma,
"status - print PUMA status\n" "status - print PUMA status\n"
"puma load addr len - load PUMA configuration data\n"); "puma load addr len - load PUMA configuration data\n");
#endif /* CFG_CMD_BSP */ #endif
/* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */ /* . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . */

2
board/sixnet/sixnet.c
View file

@ -77,7 +77,7 @@ int checkboard (void)
#if defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
#error "SXNI855T has no PCMCIA port" #error "SXNI855T has no PCMCIA port"
#endif /* CFG_CMD_PCMCIA */ #endif
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */

2
board/ssv/adnpesc1/adnpesc1.c
View file

@ -89,7 +89,7 @@ spi_chipsel_type spi_chipsel[] = {
}; };
int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]); int spi_chipsel_cnt = sizeof(spi_chipsel) / sizeof(spi_chipsel[0]);
#endif /* CFG_CMD_SPI */ #endif
#if defined(CONFIG_POST) #if defined(CONFIG_POST)
/* /*

2
board/ssv/common/cmd_sled.c
View file

@ -158,5 +158,5 @@ int do_sled (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
U_BOOT_CMD (sled, 3, 0, do_sled, U_BOOT_CMD (sled, 3, 0, do_sled,
"sled - check and set status led\n", "sled - check and set status led\n",
"sled [name [state]]\n" __NAME_STR " - state: on|off|blink\n"); "sled [name [state]]\n" __NAME_STR " - state: on|off|blink\n");
#endif /* CFG_CMD_BSP */ #endif
#endif /* CONFIG_STATUS_LED */ #endif /* CONFIG_STATUS_LED */

2
board/ssv/common/wd_pio.c
View file

@ -156,5 +156,5 @@ U_BOOT_CMD(
"wd off - switch watchdog off\n" "wd off - switch watchdog off\n"
"wd - print current status\n" "wd - print current status\n"
); );
#endif /* CFG_CMD_BSP */ #endif
#endif /* CONFIG_HW_WATCHDOG */ #endif /* CONFIG_HW_WATCHDOG */

4
board/total5200/total5200.c
View file

@ -109,7 +109,7 @@ void pci_init_board(void)
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
/* IRDA_1 aka PSC6_3 (pin C13) */ /* IRDA_1 aka PSC6_3 (pin C13) */
#define GPIO_IRDA_1 0x20000000UL #define GPIO_IRDA_1 0x20000000UL
@ -133,7 +133,7 @@ void ide_set_reset (int idereset)
*(vu_long *) MPC5XXX_GPIO_DATA_O |= GPIO_IRDA_1; *(vu_long *) MPC5XXX_GPIO_DATA_O |= GPIO_IRDA_1;
} }
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif
#ifdef CONFIG_VIDEO_SED13806 #ifdef CONFIG_VIDEO_SED13806
#include <sed13806.h> #include <sed13806.h>

2
board/tqm5200/cmd_stk52xx.c
View file

@ -1241,4 +1241,4 @@ U_BOOT_CMD(
" - loopback plug(s) for X21/X22 required\n" " - loopback plug(s) for X21/X22 required\n"
); );
#endif #endif
#endif /* CFG_CMD_BSP */ #endif

2
board/tqm5200/cmd_tb5200.c
View file

@ -101,4 +101,4 @@ U_BOOT_CMD(
); );
#endif /* CONFIG_STK52XX */ #endif /* CONFIG_STK52XX */
#endif /* CFG_CMD_BSP */ #endif

4
board/tqm5200/tqm5200.c
View file

@ -336,7 +336,7 @@ void pci_init_board(void)
} }
#endif #endif
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
#if defined (CONFIG_MINIFAP) #if defined (CONFIG_MINIFAP)
#define SM501_POWER_MODE0_GATE 0x00000040UL #define SM501_POWER_MODE0_GATE 0x00000040UL
@ -389,7 +389,7 @@ void ide_set_reset (int idereset)
} }
#endif #endif
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif
#ifdef CONFIG_POST #ifdef CONFIG_POST
/* /*

2
board/tqm8272/tqm8272.c
View file

@ -1212,7 +1212,7 @@ int board_nand_init(struct nand_chip *nand)
return 0; return 0;
} }
#endif /* CFG_CMD_NAND */ #endif
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
struct pci_controller hose; struct pci_controller hose;

2
board/trab/auto_update.c
View file

@ -47,7 +47,7 @@
#endif #endif
#if !defined(CONFIG_CMD_FAT) #if !defined(CONFIG_CMD_FAT)
#error "must define CFG_CMD_FAT" #error "must define CONFIG_CMD_FAT"
#endif #endif
/* /*

2
board/trab/cmd_trab.c
View file

@ -893,4 +893,4 @@ U_BOOT_CMD(
" For each measurment a timestamp is printeted\n" " For each measurment a timestamp is printeted\n"
); );
#endif /* CFG_CMD_BSP */ #endif

20
board/trab/trab_fkt.c
View file

@ -155,7 +155,7 @@ int i2c_write_multiple (uchar chip, uint addr, int alen, uchar *buffer,
int len); int len);
int i2c_read_multiple ( uchar chip, uint addr, int alen, uchar *buffer, int i2c_read_multiple ( uchar chip, uint addr, int alen, uchar *buffer,
int len); int len);
#endif /* CFG_CMD_I2C */ #endif
/* /*
* TRAB board specific commands. Especially commands for burn-in and function * TRAB board specific commands. Especially commands for burn-in and function
@ -1019,10 +1019,10 @@ static int touch_write_clibration_values (int calib_point, int x, int y)
} }
return 1; return 1;
#else #else
printf ("No I2C support enabled (CFG_CMD_I2C), could not write " printf ("No I2C support enabled (CONFIG_CMD_I2C), could not write "
"to EEPROM\n"); "to EEPROM\n");
return (1); return (1);
#endif /* CFG_CMD_I2C */ #endif
} }
@ -1130,10 +1130,10 @@ int do_serial_number (char **argv)
printf ("%s: unknown command %s\n", __FUNCTION__, argv[2]); printf ("%s: unknown command %s\n", __FUNCTION__, argv[2]);
return (1); /* unknown command, return error */ return (1); /* unknown command, return error */
#else #else
printf ("No I2C support enabled (CFG_CMD_I2C), could not write " printf ("No I2C support enabled (CONFIG_CMD_I2C), could not write "
"to EEPROM\n"); "to EEPROM\n");
return (1); return (1);
#endif /* CFG_CMD_I2C */ #endif
} }
@ -1160,10 +1160,10 @@ int do_crc16 (void)
} }
return (0); return (0);
#else #else
printf ("No I2C support enabled (CFG_CMD_I2C), could not write " printf ("No I2C support enabled (CONFIG_CMD_I2C), could not write "
"to EEPROM\n"); "to EEPROM\n");
return (1); return (1);
#endif /* CFG_CMD_I2C */ #endif
} }
@ -1272,10 +1272,10 @@ int do_eeprom (char **argv)
printf ("%s: invalid parameter %s\n", __FUNCTION__, argv[2]); printf ("%s: invalid parameter %s\n", __FUNCTION__, argv[2]);
return (1); return (1);
#else #else
printf ("No I2C support enabled (CFG_CMD_I2C), could not write " printf ("No I2C support enabled (CONFIG_CMD_I2C), could not write "
"to EEPROM\n"); "to EEPROM\n");
return (1); return (1);
#endif /* CFG_CMD_I2C */ #endif
} }
#if defined(CONFIG_CMD_I2C) #if defined(CONFIG_CMD_I2C)
@ -1408,4 +1408,4 @@ int i2c_read_multiple ( uchar chip, uint addr, int alen,
} }
return (0); return (0);
} }
#endif /* CFG_CMD_I2C */ #endif

2
board/uc100/pcmcia.c
View file

@ -149,7 +149,7 @@ int pcmcia_hardware_disable(int slot)
return (0); return (0);
} }
#endif /* CFG_CMD_PCMCIA */ #endif
int pcmcia_voltage_set(int slot, int vcc, int vpp) int pcmcia_voltage_set(int slot, int vcc, int vpp)

4
board/v38b/v38b.c
View file

@ -224,7 +224,7 @@ int board_early_init_r(void)
} }
#if defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) #if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
void init_ide_reset(void) void init_ide_reset(void)
{ {
debug("init_ide_reset\n"); debug("init_ide_reset\n");
@ -248,7 +248,7 @@ void ide_set_reset(int idereset)
} else } else
*(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4; *(vu_long *) MPC5XXX_WU_GPIO_DATA_O |= GPIO_PSC1_4;
} }
#endif /* defined (CFG_CMD_IDE) && defined (CONFIG_IDE_RESET) */ #endif
#ifdef CONFIG_HW_WATCHDOG #ifdef CONFIG_HW_WATCHDOG

2
board/xilinx/ml300/serial.c
View file

@ -151,4 +151,4 @@ kgdb_interruptible(int yes)
{ {
return; return;
} }
#endif /* CFG_CMD_KGDB */ #endif