drivers/: 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>
2007-06-11 19:02:10 -05:00 · 2007-06-11 19:02:10 -05:00 · d5be43de93
parent b453960d4f
commit d5be43de93
35 changed files with 59 additions and 57 deletions
--- a/drivers/bcm570x.c
+++ b/drivers/bcm570x.c
@ -6,8 +6,8 @@

 #include <common.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && (!defined(CONFIG_NET_MULTI)) && \
-	defined(CONFIG_BCM570x)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+	&& (!defined(CONFIG_NET_MULTI)) && defined(CONFIG_BCM570x)

 #ifdef CONFIG_BMW
 #include <mpc824x.h>
--- a/drivers/cfb_console.c
+++ b/drivers/cfb_console.c
@ -180,7 +180,7 @@ CONFIG_VIDEO_HW_CURSOR:	     - Uses the hardware cursor capability of the

 #endif

-#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
+#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
 #include <watchdog.h>
 #include <bmp_layout.h>
 #endif /* (CONFIG_COMMANDS & CFG_CMD_BMP) || CONFIG_SPLASH_SCREEN */
@ -709,7 +709,7 @@ void video_puts (const char *s)

 /*****************************************************************************/

-#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
+#if (CONFIG_COMMANDS & CFG_CMD_BMP) || defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)

 #define FILL_8BIT_332RGB(r,g,b)	{			\
 	*fb = ((r>>5)<<5) | ((g>>5)<<2) | (b>>6);	\
--- a/drivers/cs8900.c
+++ b/drivers/cs8900.c
@ -43,7 +43,7 @@

 #ifdef CONFIG_DRIVER_CS8900

-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)

 #undef DEBUG

--- a/drivers/dc2114x.c
+++ b/drivers/dc2114x.c
@ -20,8 +20,8 @@

 #include <common.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) \
-	&& defined(CONFIG_TULIP)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_TULIP)

 #include <malloc.h>
 #include <net.h>
--- a/drivers/e1000.c
+++ b/drivers/e1000.c
@ -44,8 +44,8 @@ tested on both gig copper and gig fiber boards

 #include "e1000.h"

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-	defined(CONFIG_E1000)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET)  || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_E1000)

 #define TOUT_LOOP   100000

--- a/drivers/eepro100.c
+++ b/drivers/eepro100.c
@ -30,8 +30,8 @@

 #undef DEBUG

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-	defined(CONFIG_EEPRO100)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_EEPRO100)

 	/* 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);
 }

-#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)
 static inline int INL (struct eth_device *dev, u_long addr)
 {
 	return le32_to_cpu (*(volatile u32 *) (addr + dev->iobase));
@ -462,7 +462,7 @@ int eepro100_initialize (bd_t * bis)

 		eth_register (dev);

-#if defined (CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII)
+#if defined (CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)
 		/* register mii command access routines */
 		miiphy_register(dev->name,
 				eepro100_miiphy_read, eepro100_miiphy_write);
--- a/drivers/inca-ip_sw.c
+++ b/drivers/inca-ip_sw.c
@ -26,8 +26,8 @@

 #include <common.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) \
-	&& defined(CONFIG_INCA_IP_SWITCH)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_INCA_IP_SWITCH)

 #include <malloc.h>
 #include <net.h>
--- a/drivers/lan91c96.c
+++ b/drivers/lan91c96.c
@ -65,7 +65,7 @@

 #ifdef CONFIG_DRIVER_LAN91C96

-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)

 /*------------------------------------------------------------------------
 *
--- a/drivers/macb.c
+++ b/drivers/macb.c
@ -17,7 +17,9 @@
 */
 #include <common.h>

-#if defined(CONFIG_MACB) && (CONFIG_COMMANDS & (CFG_CMD_NET | CFG_CMD_MII))
+#if defined(CONFIG_MACB) \
+	&& ((CONFIG_COMMANDS & (CFG_CMD_NET | CFG_CMD_MII)) \
+	    || (defined(CONFIG_CMD_NET) || defined(CONFIG_CMD_MII)))

 /*
 * The u-boot networking stack is a little weird.  It seems like the
@ -163,7 +165,7 @@ static u16 macb_mdio_read(struct macb_device *macb, u8 reg)
 	return MACB_BFEXT(DATA, frame);
 }

-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)

 static int macb_send(struct eth_device *netdev, volatile void *packet,
 		     int length)
@ -494,7 +496,7 @@ int macb_eth_initialize(int id, void *regs, unsigned int phy_addr)

 #endif /* (CONFIG_COMMANDS & CFG_CMD_NET) */

-#if (CONFIG_COMMANDS & CFG_CMD_MII)
+#if (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII)

 int miiphy_read(unsigned char addr, unsigned char reg, unsigned short *value)
 {
--- a/drivers/mpc8xx_pcmcia.c
+++ b/drivers/mpc8xx_pcmcia.c
@ -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

@ -23,7 +23,7 @@ extern int check_ide_device (int slot);
 extern int pcmcia_hardware_enable (int slot);
 extern int pcmcia_voltage_set(int slot, int vcc, int vpp);

-#if	(CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
 extern int pcmcia_hardware_disable(int slot);
 #endif

@ -189,7 +189,7 @@ int pcmcia_on (void)
 	return rc;
 }

-#if	(CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
 int pcmcia_off (void)
 {
 	int i;
--- a/drivers/nand/nand.c
+++ b/drivers/nand/nand.c
@ -23,7 +23,7 @@

 #include <common.h>

-#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 <nand.h>

--- a/drivers/nand/nand_base.c
+++ b/drivers/nand/nand_base.c
@ -72,7 +72,7 @@

 #include <common.h>

-#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 <malloc.h>
 #include <watchdog.h>
--- a/drivers/nand/nand_bbt.c
+++ b/drivers/nand/nand_bbt.c
@ -54,7 +54,7 @@

 #include <common.h>

-#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 <malloc.h>
 #include <linux/mtd/compat.h>
--- a/drivers/nand/nand_ecc.c
+++ b/drivers/nand/nand_ecc.c
@ -37,7 +37,7 @@

 #include <common.h>

-#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/mtd.h>

--- a/drivers/nand/nand_ids.c
+++ b/drivers/nand/nand_ids.c
@ -13,7 +13,7 @@

 #include <common.h>

-#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.h>

--- a/drivers/nand/nand_util.c
+++ b/drivers/nand/nand_util.c
@ -32,7 +32,7 @@

 #include <common.h>

-#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 <command.h>
 #include <watchdog.h>
--- a/drivers/nand_legacy/nand_legacy.c
+++ b/drivers/nand_legacy/nand_legacy.c
@ -22,7 +22,7 @@
 # define SHOW_BOOT_PROGRESS(arg)
 #endif

-#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>
 #include <linux/mtd/nand_ids.h>
--- a/drivers/natsemi.c
+++ b/drivers/natsemi.c
@ -56,8 +56,8 @@
 #include <asm/io.h>
 #include <pci.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-	defined(CONFIG_NATSEMI)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_NATSEMI)

 /* defines */
 #define EEPROM_SIZE 0xb /*12 16-bit chunks, or 24 bytes*/
--- a/drivers/netarm_eth.c
+++ b/drivers/netarm_eth.c
@ -30,7 +30,7 @@
 #include <asm/arch/netarm_registers.h>


-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)

 static int na_mii_poll_busy (void);

--- a/drivers/ns8382x.c
+++ b/drivers/ns8382x.c
@ -56,8 +56,8 @@
 #include <asm/io.h>
 #include <pci.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
-	defined(CONFIG_NS8382X)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_NS8382X)

 /* defines */
 #define DSIZE     0x00000FFF
--- a/drivers/pcnet.c
+++ b/drivers/pcnet.c
@ -45,8 +45,8 @@
 #define PCNET_DEBUG2(fmt,args...)
 #endif

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) \
-    && defined(CONFIG_PCNET)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET)  || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_PCNET)

 #if !defined(CONF_PCNET_79C973) && defined(CONF_PCNET_79C975)
 #error "Macro for PCnet chip version is not defined!"
--- a/drivers/plb2800_eth.c
+++ b/drivers/plb2800_eth.c
@ -25,8 +25,8 @@

 #include <common.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) \
-	&& defined(CONFIG_PLB2800_ETHER)
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) \
+	&& defined(CONFIG_NET_MULTI) && defined(CONFIG_PLB2800_ETHER)

 #include <malloc.h>
 #include <net.h>
--- a/drivers/pxa_pcmcia.c
+++ b/drivers/pxa_pcmcia.c
@ -85,7 +85,7 @@ int pcmcia_on (void)
 	return rc;
 }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
 int pcmcia_off (void)
 {
 	return 0;
--- a/drivers/rpx_pcmcia.c
+++ b/drivers/rpx_pcmcia.c
@ -9,11 +9,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

@ -62,7 +62,7 @@ int pcmcia_hardware_enable (int slot)
 	return 0;	/* No hardware to enable */
 }

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA)
+#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)
 static int pcmcia_hardware_disable(int slot)
 {
 	return 0;	/* No hardware to disable */
--- a/drivers/rtl8019.c
+++ b/drivers/rtl8019.c
@ -34,7 +34,7 @@

 #ifdef CONFIG_DRIVER_RTL8019

-#if (CONFIG_COMMANDS & CFG_CMD_NET)
+#if (CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)


 /* packet page register access functions */
--- a/drivers/rtl8139.c
+++ b/drivers/rtl8139.c
@ -77,7 +77,7 @@
 #include <asm/io.h>
 #include <pci.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_RTL8139)

 #define TICKS_PER_SEC	CFG_HZ
--- a/drivers/rtl8169.c
+++ b/drivers/rtl8169.c
@ -55,7 +55,7 @@
 #include <asm/io.h>
 #include <pci.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_RTL8169)

 #undef DEBUG_RTL8169
--- a/drivers/sk98lin/uboot_drv.c
+++ b/drivers/sk98lin/uboot_drv.c
@ -25,7 +25,7 @@

 #include <common.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) && \
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_SK98)

 #include "h/skdrv1st.h"
--- a/drivers/sym53c8xx.c
+++ b/drivers/sym53c8xx.c
@ -51,7 +51,7 @@
 #define PRINTF(fmt,args...)
 #endif

-#if (CONFIG_COMMANDS & CFG_CMD_SCSI) && defined(CONFIG_SCSI_SYM53C8XX)
+#if ((CONFIG_COMMANDS & CFG_CMD_SCSI) || defined(CONFIG_CMD_SCSI)) && defined(CONFIG_SCSI_SYM53C8XX)

 #undef SCSI_SINGLE_STEP
 /*
--- a/drivers/ti_pci1410a.c
+++ b/drivers/ti_pci1410a.c
@ -64,7 +64,7 @@

 #include <pcmcia.h>

-#if (CONFIG_COMMANDS & CFG_CMD_PCMCIA) && defined(CONFIG_IDE_TI_CARDBUS)
+#if ((CONFIG_COMMANDS & CFG_CMD_PCMCIA) || defined(CONFIG_CMD_PCMCIA)) && defined(CONFIG_IDE_TI_CARDBUS)

 int pcmcia_on(int ide_base_bus);

--- a/drivers/tigon3.c
+++ b/drivers/tigon3.c
@ -12,7 +12,7 @@
 /******************************************************************************/
 #include <common.h>
 #include <asm/types.h>
-#if (CONFIG_COMMANDS & CFG_CMD_NET) && !defined(CONFIG_NET_MULTI) && \
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || defined(CONFIG_CMD_NET)) && !defined(CONFIG_NET_MULTI) && \
 	defined(CONFIG_TIGON3)
 #ifdef CONFIG_BMW
 #include <mpc824x.h>
--- a/drivers/tqm8xx_pcmcia.c
+++ b/drivers/tqm8xx_pcmcia.c
@ -10,11 +10,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

@ -241,7 +241,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)
 {
 	u_long reg;
--- a/drivers/tsec.c
+++ b/drivers/tsec.c
@ -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) \
+#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_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) \
+#if defined(CONFIG_MII) || (CONFIG_COMMANDS & CFG_CMD_MII) || defined(CONFIG_CMD_MII) \
 	&& !defined(BITBANGMII)

 struct tsec_private *get_priv_for_phy(unsigned char phyaddr)
--- a/drivers/tsi108_eth.c
+++ b/drivers/tsi108_eth.c
@ -27,7 +27,7 @@

 #include <config.h>

-#if (CONFIG_COMMANDS & CFG_CMD_NET) && defined(CONFIG_NET_MULTI) \
+#if ((CONFIG_COMMANDS & CFG_CMD_NET) || 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)
--- a/drivers/tsi108_i2c.c
+++ b/drivers/tsi108_i2c.c
@ -28,7 +28,7 @@
 #ifdef CONFIG_TSI108_I2C
 #include <tsi108.h>

-#if (CONFIG_COMMANDS & CFG_CMD_I2C)
+#if (CONFIG_COMMANDS & CFG_CMD_I2C) || defined(CONFIG_CMD_I2C)

 #define I2C_DELAY	100000
 #undef  DEBUG_I2C