summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2007-07-10 11:13:21 -0500
committerJon Loeliger <jdl@freescale.com>2007-07-10 11:13:21 -0500
commitddb5d86f0215bcb6c293510c50eb050e92883b7a (patch)
treec1b8bcfa43d6161683554bfa646610bc8df94721
parentf40a7f3e3888b42a43674b099e5470022c8c544c (diff)
downloadu-boot-imx-ddb5d86f0215bcb6c293510c50eb050e92883b7a.zip
u-boot-imx-ddb5d86f0215bcb6c293510c50eb050e92883b7a.tar.gz
u-boot-imx-ddb5d86f0215bcb6c293510c50eb050e92883b7a.tar.bz2
drivers/: Remove lingering references to CFG_CMD_* symbols.
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>
-rw-r--r--drivers/bcm570x.c2
-rw-r--r--drivers/cfb_console.c6
-rw-r--r--drivers/dc2114x.c2
-rw-r--r--drivers/mpc8xx_pcmcia.c2
-rw-r--r--drivers/rtl8139.c2
-rw-r--r--drivers/tigon3.c2
-rw-r--r--drivers/tqm8xx_pcmcia.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/bcm570x.c b/drivers/bcm570x.c
index b00bcd7..703cda4 100644
--- a/drivers/bcm570x.c
+++ b/drivers/bcm570x.c
@@ -1688,4 +1688,4 @@ QQ_GetTail(
return pQueue->Array[Idx];
}
-#endif /* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_BCM570x */
+#endif
diff --git a/drivers/cfb_console.c b/drivers/cfb_console.c
index 617361e..bcf8771 100644
--- a/drivers/cfb_console.c
+++ b/drivers/cfb_console.c
@@ -63,7 +63,7 @@
loop in VIDEO_TSTC_FCT (i8042)
CFG_CONSOLE_BLINK_COUNT - value for delay loop - blink rate
CONFIG_CONSOLE_TIME - display time/date in upper right corner,
- needs CFG_CMD_DATE and CONFIG_CONSOLE_CURSOR
+ needs CONFIG_CMD_DATE and CONFIG_CONSOLE_CURSOR
CONFIG_VIDEO_LOGO - display Linux Logo in upper left corner
CONFIG_VIDEO_BMP_LOGO - use bmp_logo instead of linux_logo
CONFIG_CONSOLE_EXTRA_INFO - display additional board information strings
@@ -175,9 +175,9 @@ CONFIG_VIDEO_HW_CURSOR: - Uses the hardware cursor capability of the
#include <linux/types.h>
#include <devices.h>
#include <video_font.h>
-#ifdef CFG_CMD_DATE
-#include <rtc.h>
+#if defined(CONFIG_CMD_DATE)
+#include <rtc.h>
#endif
#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
diff --git a/drivers/dc2114x.c b/drivers/dc2114x.c
index 721bbfc..d5275dc 100644
--- a/drivers/dc2114x.c
+++ b/drivers/dc2114x.c
@@ -768,4 +768,4 @@ static void update_srom(struct eth_device *dev, bd_t *bis)
}
#endif /* UPDATE_SROM */
-#endif /* CFG_CMD_NET && CONFIG_NET_MULTI && CONFIG_TULIP */
+#endif
diff --git a/drivers/mpc8xx_pcmcia.c b/drivers/mpc8xx_pcmcia.c
index 04c44a4..8a34cd3 100644
--- a/drivers/mpc8xx_pcmcia.c
+++ b/drivers/mpc8xx_pcmcia.c
@@ -221,7 +221,7 @@ int pcmcia_off (void)
pcmcia_hardware_disable(_slot_);
return 0;
}
-#endif /* CFG_CMD_PCMCIA */
+#endif
static u_int m8xx_get_graycode(u_int size)
diff --git a/drivers/rtl8139.c b/drivers/rtl8139.c
index 4954cd0..9045523 100644
--- a/drivers/rtl8139.c
+++ b/drivers/rtl8139.c
@@ -535,4 +535,4 @@ static void rtl_disable(struct eth_device *dev)
udelay (100); /* wait 100us */
}
}
-#endif /* CFG_CMD_NET && CONFIG_NET_MULTI && CONFIG_RTL8139 */
+#endif
diff --git a/drivers/tigon3.c b/drivers/tigon3.c
index 7506a67..860a889 100644
--- a/drivers/tigon3.c
+++ b/drivers/tigon3.c
@@ -6197,4 +6197,4 @@ LM_DmaTest(PLM_DEVICE_BLOCK pDevice, PLM_UINT8 pBufferVirt,
}
return LM_STATUS_SUCCESS;
}
-#endif /* CFG_CMD_NET, !CONFIG_NET_MULTI, CONFIG_TIGON3 */
+#endif
diff --git a/drivers/tqm8xx_pcmcia.c b/drivers/tqm8xx_pcmcia.c
index ce4b006..132c7a5 100644
--- a/drivers/tqm8xx_pcmcia.c
+++ b/drivers/tqm8xx_pcmcia.c
@@ -263,7 +263,7 @@ int pcmcia_hardware_disable(int slot)
return (0);
}
-#endif /* CFG_CMD_PCMCIA */
+#endif
int pcmcia_voltage_set(int slot, int vcc, int vpp)
{