LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/[a-m]*: Remove obsolete references to CONFIG_COMMANDS 

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-07-09 17:30:01 -05:00
parent cde5c64d17
commit 07d38a17e9
10 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bcm570x.c
View File

@ -6,7 +6,7 @@
#include <common.h> #include <common.h>
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \ #if defined(CONFIG_CMD_NET) \
&& (!defined(CONFIG_NET_MULTI)) && defined(CONFIG_BCM570x) && (!defined(CONFIG_NET_MULTI)) && defined(CONFIG_BCM570x)
#ifdef CONFIG_BMW #ifdef CONFIG_BMW

8
drivers/cfb_console.c
View File

@ -180,10 +180,10 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability of the
#endif #endif
#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN) #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
#include <watchdog.h> #include <watchdog.h>
#include <bmp_layout.h> #include <bmp_layout.h>
#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */ #endif
/*****************************************************************************/ /*****************************************************************************/
/* Cursor definition: */ /* Cursor definition: */
@ -709,7 +709,7 @@ void video_puts (const char *s)
/*****************************************************************************/ /*****************************************************************************/
#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN) #if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
#define FILL_8BIT_332RGB(r,g,b) { \ #define FILL_8BIT_332RGB(r,g,b) { \
*fb = ((r>>5)<<5) | ((g>>5)<<2) | (b>>6); \ *fb = ((r>>5)<<5) | ((g>>5)<<2) | (b>>6); \
@ -1004,7 +1004,7 @@ int video_display_bitmap (ulong bmp_image, int x, int y)
return (0); return (0);
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */ #endif
/*****************************************************************************/ /*****************************************************************************/

2
drivers/cs8900.c
View File

@ -43,7 +43,7 @@
#ifdef CONFIG_DRIVER_CS8900 #ifdef CONFIG_DRIVER_CS8900
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
#undef DEBUG #undef DEBUG

2
drivers/dc2114x.c
View File

@ -20,7 +20,7 @@
#include <common.h> #include <common.h>
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \ #if defined(CONFIG_CMD_NET) \
&& defined(CONFIG_NET_MULTI) && defined(CONFIG_TULIP) && defined(CONFIG_NET_MULTI) && defined(CONFIG_TULIP)
#include <malloc.h> #include <malloc.h>

2
drivers/e1000.c
View File

@ -44,7 +44,7 @@ tested on both gig copper and gig fiber boards
#include "e1000.h" #include "e1000.h"
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \ #if defined(CONFIG_CMD_NET) \
&& defined(CONFIG_NET_MULTI) && defined(CONFIG_E1000) && defined(CONFIG_NET_MULTI) && defined(CONFIG_E1000)
#define TOUT_LOOP 100000 #define TOUT_LOOP 100000

8
drivers/eepro100.c
View File

@ -30,7 +30,7 @@
#undef DEBUG #undef DEBUG
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \ #if defined(CONFIG_CMD_NET) \
&& defined(CONFIG_NET_MULTI) && defined(CONFIG_EEPRO100) && defined(CONFIG_NET_MULTI) && defined(CONFIG_EEPRO100)
/* Ethernet chip registers. /* Ethernet chip registers.
@ -272,7 +272,7 @@ static inline void OUTL (struct eth_device *dev, int command, u_long addr)
*(volatile u32 *) ((addr + dev->iobase)) = cpu_to_le32 (command); *(volatile u32 *) ((addr + dev->iobase)) = cpu_to_le32 (command);
} }
#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
static inline int INL (struct eth_device *dev, u_long addr) static inline int INL (struct eth_device *dev, u_long addr)
{ {
return le32_to_cpu (*(volatile u32 *) (addr + dev->iobase)); return le32_to_cpu (*(volatile u32 *) (addr + dev->iobase));
@ -386,7 +386,7 @@ static int eepro100_miiphy_write (char *devname, unsigned char addr,
return 0; return 0;
} }
#endif /* defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) */ #endif
/* Wait for the chip get the command. /* Wait for the chip get the command.
*/ */
@ -462,7 +462,7 @@ int eepro100_initialize (bd_t * bis)
eth_register (dev); eth_register (dev);
#if defined (CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined (CONFIG_MII) || defined(CONFIG_CMD_MII)
/* register mii command access routines */ /* register mii command access routines */
miiphy_register(dev->name, miiphy_register(dev->name,
eepro100_miiphy_read, eepro100_miiphy_write); eepro100_miiphy_read, eepro100_miiphy_write);

2
drivers/inca-ip_sw.c
View File

@ -26,7 +26,7 @@
#include <common.h> #include <common.h>
#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \ #if defined(CONFIG_CMD_NET) \
&& defined(CONFIG_NET_MULTI) && defined(CONFIG_INCA_IP_SWITCH) && defined(CONFIG_NET_MULTI) && defined(CONFIG_INCA_IP_SWITCH)
#include <malloc.h> #include <malloc.h>

2
drivers/lan91c96.c
View File

@ -65,7 +65,7 @@
#ifdef CONFIG_DRIVER_LAN91C96 #ifdef CONFIG_DRIVER_LAN91C96
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------
* *

11
drivers/macb.c
View File

@ -18,8 +18,7 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_MACB) \ #if defined(CONFIG_MACB) \
&& ((CONFIG_COMMANDS & (CFG_CMD_NET | CFG_CMD_MII)) \ && (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)))
|| (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)))
/* /*
* The u-boot networking stack is a little weird. It seems like the * The u-boot networking stack is a little weird. It seems like the
@ -165,7 +164,7 @@ static u16 macb_mdio_read(struct macb_device *macb, u8 reg)
return MACB_BFEXT(DATA, frame); return MACB_BFEXT(DATA, frame);
} }
#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET) #if defined(CONFIG_CMD_NET)
static int macb_send(struct eth_device *netdev, volatile void *packet, static int macb_send(struct eth_device *netdev, volatile void *packet,
int length) int length)
@ -494,9 +493,9 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)
return 0; return 0;
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_NET) */ #endif
#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) #if defined(CONFIG_CMD_MII)
int miiphy_read(unsigned char addr, unsigned char reg, unsigned short *value) int miiphy_read(unsigned char addr, unsigned char reg, unsigned short *value)
{ {
@ -572,6 +571,6 @@ int miiphy_write(unsigned char addr, unsigned char reg, unsigned short value)
return 0; return 0;
} }
#endif /* (CONFIG_COMMANDS & CFG_CMD_MII) */ #endif
#endif /* CONFIG_MACB */ #endif /* CONFIG_MACB */

8
drivers/mpc8xx_pcmcia.c
View File

@ -6,11 +6,11 @@
#undef CONFIG_PCMCIA #undef CONFIG_PCMCIA
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
#define CONFIG_PCMCIA #define CONFIG_PCMCIA
#endif #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 #define CONFIG_PCMCIA
#endif #endif
@ -23,7 +23,7 @@ extern int check_ide_device (int slot);
extern int pcmcia_hardware_enable (int slot); extern int pcmcia_hardware_enable (int slot);
extern int pcmcia_voltage_set(int slot, int vcc, int vpp); extern int pcmcia_voltage_set(int slot, int vcc, int vpp);
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
extern int pcmcia_hardware_disable(int slot); extern int pcmcia_hardware_disable(int slot);
#endif #endif
@ -189,7 +189,7 @@ int pcmcia_on (void)
return rc; return rc;
} }
#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA) #if defined(CONFIG_CMD_PCMCIA)
int pcmcia_off (void) int pcmcia_off (void)
{ {
int i; int i;