Skip to contentSkip to conversation

cpu/ rtc/ include/: Remove lingering references to CFG_CMD_* symbols.

PATCH New Jon Loeliger 1 participant 1 message Jul 10, 2007

lore
Share & tools
lore

Jon Loeliger

author
#0 lore raw

PATCH 7/14 cpu/ rtc/ include/: Remove lingering references to CFG_CMD_* symbols.

Signed-off-by Jon Loeliger <[email protected]>
---
 cpu/74xx_7xx/kgdb.S     |    2 +-
 cpu/i386/serial.c       |    2 +-
 cpu/mcf52x2/fec.c       |    2 +-
 cpu/mpc5xxx/ide.c       |    4 ++--
 cpu/mpc8260/ether_fcc.c |    2 +-
 cpu/mpc8260/ether_scc.c |    2 +-
 cpu/mpc8260/kgdb.S      |    2 +-
 cpu/mpc85xx/ether_fcc.c |    2 +-
 cpu/mpc8xx/fec.c        |    2 +-
 cpu/mpc8xx/kgdb.S       |    2 +-
 cpu/mpc8xx/scc.c        |    2 +-
 cpu/mpc8xx/serial.c     |    2 +-
 cpu/ppc4xx/dcr.S        |    2 +-
 cpu/ppc4xx/kgdb.S       |    2 +-
 cpu/ppc4xx/serial.c     |    2 +-
 include/_exports.h      |    2 +-
 include/exports.h       |    2 +-
 include/pcmcia.h        |    2 +-
 rtc/bf5xx_rtc.c         |    2 +-
 rtc/date.c              |    2 +-
 rtc/ds1307.c            |    2 +-
 rtc/ds1337.c            |    2 +-
 rtc/ds1374.c            |    2 +-
 rtc/ds1556.c            |    2 +-
 rtc/ds164x.c            |    2 +-
 rtc/ds174x.c            |    2 +-
 rtc/m41t11.c            |    2 +-
 rtc/m48t35ax.c          |    2 +-
 rtc/max6900.c           |    2 +-
 rtc/mc146818.c          |    2 +-
 rtc/mpc5xxx.c           |    2 +-
 rtc/mpc8xx.c            |    4 +---
 rtc/pcf8563.c           |    2 +-
 rtc/s3c24x0_rtc.c       |    4 +---
 34 files changed, 35 insertions(+), 39 deletions(-)
cpu/74xx_7xx/kgdb.S +1 -1
index cd8869c..4f23122 100644
@@ -74,4 +74,4 @@ kgdb_flush_cache_range:
 	SYNC
 	blr
 
-#endif /* CFG_CMD_KGDB */
+#endif
cpu/i386/serial.c +1 -1
index 4933d23..baf35e5 100644
@@ -500,4 +500,4 @@ void kgdb_interruptible(int yes)
 	return;
 }
 #endif	/* (CONFIG_KGDB_SER_INDEX & 2) */
-#endif	/* CFG_CMD_KGDB */
+#endif
cpu/mcf52x2/fec.c +1 -1
index 255b3d8..ef9c798 100644
@@ -592,7 +592,7 @@ int mcf52x2_miiphy_write (char *devname, unsigned char addr,
 	return 0;
 }
 #endif
-#endif /* CFG_CMD_NET, FEC_ENET */
+#endif
 
 int mcf52x2_miiphy_initialize(bd_t *bis)
 {
cpu/mpc5xxx/ide.c +2 -2
index 29b99f6..087ddac 100644
@@ -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 */
+#endif
cpu/mpc8260/ether_fcc.c +1 -1
index 08d2847..37bf445 100644
@@ -1187,4 +1187,4 @@ eth_loopback_test (void)
 
 #endif /* CONFIG_ETHER_LOOPBACK_TEST */
 
-#endif	/* CONFIG_ETHER_ON_FCC && CFG_CMD_NET && CONFIG_NET_MULTI */
+#endif
cpu/mpc8260/ether_scc.c +1 -1
index b9ae082..e56839d 100644
@@ -353,4 +353,4 @@ void restart(void)
 }
 #endif
 
-#endif  /* CONFIG_ETHER_ON_SCC && CFG_CMD_NET */
+#endif
cpu/mpc8260/kgdb.S +1 -1
index 5a7d0b7..dae87bb 100644
@@ -69,4 +69,4 @@ kgdb_flush_cache_range:
 	SYNC
 	blr
 
-#endif /* CFG_CMD_KGDB */
+#endif
cpu/mpc85xx/ether_fcc.c +1 -1
index 4448cc3..5b23a80 100644
@@ -468,6 +468,6 @@ int fec_initialize(bd_t *bis)
 	return 1;
 }
 
-#endif	/* CONFIG_ETHER_ON_FCC && CFG_CMD_NET && CONFIG_NET_MULTI */
+#endif
 
 #endif /* CONFIG_CPM2 */
cpu/mpc8xx/fec.c +1 -1
index 10d825f..08a3715 100644
@@ -1022,4 +1022,4 @@ int fec8xx_miiphy_write(char *devname, unsigned char  addr,
 }
 #endif
 
-#endif	/* CFG_CMD_NET, FEC_ENET */
+#endif
cpu/mpc8xx/kgdb.S +1 -1
index d4c77e7..812baa3 100644
@@ -71,4 +71,4 @@ kgdb_flush_cache_range:
 	SYNC
 	blr
 
-#endif /* CFG_CMD_KGDB */
+#endif
cpu/mpc8xx/scc.c +1 -1
index a0ec5d7..744dcdd 100644
@@ -567,4 +567,4 @@ void restart (void)
 		(SCC_GSMRL_ENR | SCC_GSMRL_ENT);
 }
 #endif
-#endif	/* CFG_CMD_NET, SCC_ENET */
+#endif
cpu/mpc8xx/serial.c +1 -1
index 6e08b53..68804cc 100644
@@ -723,6 +723,6 @@ kgdb_interruptible (int yes)
 {
 	return;
 }
-#endif	/* CFG_CMD_KGDB	*/
+#endif
 
 #endif	/* CONFIG_8xx_CONS_NONE */
cpu/ppc4xx/dcr.S +1 -1
index fe136e0..93465a3 100644
@@ -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 */
+#endif
cpu/ppc4xx/kgdb.S +1 -1
index cd12727..8c4bbf2 100644
@@ -75,4 +75,4 @@ kgdb_flush_cache_range:
 	SYNC
 	blr
 
-#endif /* CFG_CMD_KGDB */
+#endif
cpu/ppc4xx/serial.c +1 -1
index aefa4ca..3f67136 100644
@@ -949,7 +949,7 @@ void kgdb_interruptible (int yes)
 	return;
 }
 #endif	/* (CONFIG_KGDB_SER_INDEX & 2) */
-#endif	/* CFG_CMD_KGDB */
+#endif
 
 
 #if defined(CONFIG_SERIAL_MULTI)
include/_exports.h +1 -1
index eeb65f4..a0fbf2a 100644
@@ -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 */
+#endif
include/exports.h +1 -1
index ad20502..704b133 100644
@@ -26,7 +26,7 @@ void setenv (char *varname, char *varvalue);
 #if defined(CONFIG_CMD_I2C)
 int i2c_write (uchar, uint, int , uchar* , int);
 int i2c_read (uchar, uint, int , uchar* , int);
-#endif	/* CFG_CMD_I2C */
+#endif
 
 void app_startup(char **);
include/pcmcia.h +1 -1
index c028ab7..7305805 100644
@@ -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) */
+#endif
 
 #ifdef	CONFIG_8xx
 extern u_int *pcmcia_pgcrx[];
rtc/bf5xx_rtc.c +1 -1
index 17a19eb..8856bb9 100644
@@ -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 */
+#endif
rtc/date.c +1 -1
index d00b144..a83a723 100644
@@ -153,4 +153,4 @@ mktime (unsigned int year, unsigned int mon,
 	)*60 + sec; /* finally seconds */
 }
 
-#endif	/* CFG_CMD_DATE */
+#endif
rtc/ds1307.c +1 -1
index a2a8633..c882d79 100644
@@ -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) */
+#endif
rtc/ds1337.c +1 -1
index b871d07..c636ac5 100644
@@ -188,4 +188,4 @@ static unsigned char bin2bcd (unsigned int n)
 	return (((n / 10) << 4) | (n % 10));
 }
 
-#endif /* CONFIG_RTC_DS1337 && (CFG_COMMANDS & CFG_CMD_DATE) */
+#endif
rtc/ds1374.c +1 -1
index 6ee7ab4..e773dd9 100644
@@ -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) */
+#endif
rtc/ds1556.c +1 -1
index 440d43a..4365cfb 100644
@@ -203,4 +203,4 @@ static unsigned char bin2bcd (unsigned int n)
 	return (((n / 10) << 4) | (n % 10));
 }
 
-#endif	/* CONFIG_RTC_DS1556 && CFG_CMD_DATE */
+#endif
rtc/ds164x.c +1 -1
index e82ca59..bff22b9 100644
@@ -197,4 +197,4 @@ static unsigned char bin2bcd (unsigned int n)
 	return (((n / 10) << 4) | (n % 10));
 }
 
-#endif	/* CONFIG_RTC_DS164x && CFG_CMD_DATE */
+#endif
rtc/ds174x.c +1 -1
index e3028e2..5f85a68 100644
@@ -199,4 +199,4 @@ static unsigned char bin2bcd (unsigned int n)
 	return (((n / 10) << 4) | (n % 10));
 }
 
-#endif	/* CONFIG_RTC_MC146818 && CFG_CMD_DATE */
+#endif
rtc/m41t11.c +1 -1
index 1e35b06..81da33a 100644
@@ -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 */
+#endif
rtc/m48t35ax.c +1 -1
index 6133b46..0a0ffa8 100644
@@ -163,4 +163,4 @@ static unsigned char bin2bcd (unsigned int n)
 	return (((n / 10) << 4) | (n % 10));
 }
 
-#endif	/* CONFIG_RTC_M48T35A && CFG_CMD_DATE */
+#endif
rtc/max6900.c +1 -1
index 63f643c..c75a8e0 100644
@@ -128,4 +128,4 @@ void rtc_reset (void)
 {
 }
 
-#endif	/* CONFIG_RTC_MAX6900 && CFG_CMD_DATE */
+#endif
rtc/mc146818.c +1 -1
index bbb6486..ab377ed 100644
@@ -175,4 +175,4 @@ static unsigned char bin2bcd (unsigned int n)
 	return (((n / 10) << 4) | (n % 10));
 }
 
-#endif	/* CONFIG_RTC_MC146818 && CFG_CMD_DATE */
+#endif
rtc/mpc5xxx.c +1 -1
index 72f3111..216386a 100644
@@ -137,4 +137,4 @@ void rtc_reset (void)
 	return;	/* nothing to do */
 }
 
-#endif	/* CONFIG_RTC_MPC5200 && CFG_CMD_DATE */
+#endif
rtc/mpc8xx.c +1 -3
index 716cd53..8d10c0e 100644
@@ -70,6 +70,4 @@ void rtc_reset (void)
 	return;	/* nothing to do */
 }
 
-/* ------------------------------------------------------------------------- */
-
-#endif	/* CONFIG_RTC_MPC8xx && CFG_CMD_DATE */
+#endif
rtc/pcf8563.c +1 -1
index 5e86836..2d73d5d 100644
@@ -141,4 +141,4 @@ static unsigned char bin2bcd (unsigned int n)
 	return (((n / 10) << 4) | (n % 10));
 }
 
-#endif	/* CONFIG_RTC_PCF8563 && CFG_CMD_DATE */
+#endif
rtc/s3c24x0_rtc.c +1 -3
index 902b737..7f8b4fa 100644
@@ -175,6 +175,4 @@ void rtc_reset (void)
 	rtc->RTCCON &= ~(0x08|0x01);
 }
 
-/* ------------------------------------------------------------------------- */
-
-#endif	/* CONFIG_RTC_S3C24X0 && CFG_CMD_DATE */
+#endif
Signature · 1 line
1.5.2.2.249.g45fd