Signed-off-by: Jon Loeliger <jdl@freescale.com>
@@ -74,4 +74,4 @@ kgdb_flush_cache_range:
SYNC
blr
-#endif /* CFG_CMD_KGDB */
+#endif
@@ -500,4 +500,4 @@ void kgdb_interruptible(int yes)
return;
}
#endif /* (CONFIG_KGDB_SER_INDEX & 2) */
@@ -592,7 +592,7 @@ int mcf52x2_miiphy_write (char *devname, unsigned char addr,
return 0;
#endif
-#endif /* CFG_CMD_NET, FEC_ENET */
int mcf52x2_miiphy_initialize(bd_t *bis)
{
@@ -24,7 +24,7 @@
*/
#include <common.h>
-#ifdef CFG_CMD_IDE
+#if defined(CONFIG_CMD_IDE)
#include <mpc5xxx.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -85,4 +85,4 @@ int ide_preinit (void)
return (0);
-#endif /* CFG_CMD_IDE */
@@ -1187,4 +1187,4 @@ eth_loopback_test (void)
#endif /* CONFIG_ETHER_LOOPBACK_TEST */
-#endif /* CONFIG_ETHER_ON_FCC && CFG_CMD_NET && CONFIG_NET_MULTI */
@@ -353,4 +353,4 @@ void restart(void)
-#endif /* CONFIG_ETHER_ON_SCC && CFG_CMD_NET */
@@ -69,4 +69,4 @@ kgdb_flush_cache_range:
@@ -468,6 +468,6 @@ int fec_initialize(bd_t *bis)
return 1;
#endif /* CONFIG_CPM2 */
@@ -1022,4 +1022,4 @@ int fec8xx_miiphy_write(char *devname, unsigned char addr,
@@ -71,4 +71,4 @@ kgdb_flush_cache_range:
@@ -567,4 +567,4 @@ void restart (void)
(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
-#endif /* CFG_CMD_NET, SCC_ENET */
@@ -723,6 +723,6 @@ kgdb_interruptible (int yes)
#endif /* CONFIG_8xx_CONS_NONE */
@@ -195,4 +195,4 @@ set_dcr:
blr /* Return to calling function */
.Lfe4: .size set_dcr,.Lfe4-set_dcr
/* end set_dcr() */
-#endif /* CONFIG_4xx & CFG_CMD_SETGETDCR */
@@ -75,4 +75,4 @@ kgdb_flush_cache_range:
@@ -949,7 +949,7 @@ void kgdb_interruptible (int yes)
#if defined(CONFIG_SERIAL_MULTI)
@@ -18,4 +18,4 @@ EXPORT_FUNC(simple_strtoul)
#if defined(CONFIG_CMD_I2C)
EXPORT_FUNC(i2c_write)
EXPORT_FUNC(i2c_read)
-#endif /* CFG_CMD_I2C */
@@ -26,7 +26,7 @@ void setenv (char *varname, char *varvalue);
int i2c_write (uchar, uint, int , uchar* , int);
int i2c_read (uchar, uint, int , uchar* , int);
void app_startup(char **);
@@ -306,7 +306,7 @@ typedef struct {
#define CISTPL_IDE_HAS_INDEX 0x20
#define CISTPL_IDE_IOIS16 0x40
-#endif /* CFG_CMD_PCMCIA || CFG_CMD_IDE && (CONFIG_IDE_8xx_PCCARD || CONFIG_IDE_8xx_DIRECT) */
#ifdef CONFIG_8xx
extern u_int *pcmcia_pgcrx[];
@@ -140,4 +140,4 @@ void rtc_get(struct rtc_time *tmp)
MIN_TO_SECS(tm_min) + HRS_TO_SECS(tm_hour) + DAYS_TO_SECS(tm_day);
to_tm(time_in_sec, tmp);
-#endif /* CONFIG_RTC_BFIN && CFG_CMD_DATE */
@@ -153,4 +153,4 @@ mktime (unsigned int year, unsigned int mon,
)*60 + sec; /* finally seconds */
-#endif /* CFG_CMD_DATE */
@@ -201,4 +201,4 @@ static unsigned char bin2bcd (unsigned int n)
return (((n / 10) << 4) | (n % 10));
-#endif /* (CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338) && (CFG_COMMANDS & CFG_CMD_DATE) */
@@ -188,4 +188,4 @@ static unsigned char bin2bcd (unsigned int n)
-#endif /* CONFIG_RTC_DS1337 && (CFG_COMMANDS & CFG_CMD_DATE) */
@@ -250,4 +250,4 @@ static void rtc_write_raw (uchar reg, uchar val)
i2c_reg_write (CFG_I2C_RTC_ADDR, reg, val);
-#endif /* (CONFIG_RTC_DS1374) && (CFG_COMMANDS & CFG_CMD_DATE) */
@@ -203,4 +203,4 @@ static unsigned char bin2bcd (unsigned int n)
-#endif /* CONFIG_RTC_DS1556 && CFG_CMD_DATE */
@@ -197,4 +197,4 @@ static unsigned char bin2bcd (unsigned int n)
-#endif /* CONFIG_RTC_DS164x && CFG_CMD_DATE */
@@ -199,4 +199,4 @@ static unsigned char bin2bcd (unsigned int n)
-#endif /* CONFIG_RTC_MC146818 && CFG_CMD_DATE */
@@ -199,4 +199,4 @@ int rtc_recall(int addr, unsigned char* data, int size)
return i2c_read( CFG_I2C_RTC_ADDR, REG_CNT+addr, 1, data, size );
-#endif /* CONFIG_RTC_M41T11 && CFG_I2C_RTC_ADDR && CFG_CMD_DATE */
@@ -163,4 +163,4 @@ static unsigned char bin2bcd (unsigned int n)
-#endif /* CONFIG_RTC_M48T35A && CFG_CMD_DATE */
@@ -128,4 +128,4 @@ void rtc_reset (void)
-#endif /* CONFIG_RTC_MAX6900 && CFG_CMD_DATE */
@@ -175,4 +175,4 @@ static unsigned char bin2bcd (unsigned int n)
@@ -137,4 +137,4 @@ void rtc_reset (void)
return; /* nothing to do */
-#endif /* CONFIG_RTC_MPC5200 && CFG_CMD_DATE */
@@ -70,6 +70,4 @@ void rtc_reset (void)
-/* ------------------------------------------------------------------------- */
-
-#endif /* CONFIG_RTC_MPC8xx && CFG_CMD_DATE */
@@ -141,4 +141,4 @@ static unsigned char bin2bcd (unsigned int n)
-#endif /* CONFIG_RTC_PCF8563 && CFG_CMD_DATE */
@@ -175,6 +175,4 @@ void rtc_reset (void)
rtc->RTCCON &= ~(0x08|0x01);
-#endif /* CONFIG_RTC_S3C24X0 && CFG_CMD_DATE */