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

Signed-off-by: Jon Loeliger <jdl@freescale.com>

diff --git a/cpu/74xx_7xx/kgdb.S b/cpu/74xx_7xx/kgdb.S
index cd8869c20060f4d6b402a55c3a7078e14b2f91e9..4f231228c2285950ed4f2df46f99ec01111bcc7f 100644 (file)
--- a/cpu/74xx_7xx/kgdb.S
+++ b/cpu/74xx_7xx/kgdb.S
@@ -74,4 +74,4 @@ kgdb_flush_cache_range:
        SYNC
        blr
 
-#endif /* CFG_CMD_KGDB */
+#endif

diff --git a/cpu/i386/serial.c b/cpu/i386/serial.c
index 4933d23fd41b7fff6e6884e991f72a42e6f467f8..baf35e53d57db02cdb1b9a804aedde048d4a8311 100644 (file)
--- a/cpu/i386/serial.c
+++ b/cpu/i386/serial.c
@@ -500,4 +500,4 @@ void kgdb_interruptible(int yes)
        return;
 }
 #endif /* (CONFIG_KGDB_SER_INDEX & 2) */
-#endif /* CFG_CMD_KGDB */
+#endif

diff --git a/cpu/mcf52x2/fec.c b/cpu/mcf52x2/fec.c
index 255b3d8b7bcd79761cf642149b09e04cca55d7c7..ef9c7984ca32a176fcca6d493bb77aa8e9730063 100644 (file)
--- a/cpu/mcf52x2/fec.c
+++ b/cpu/mcf52x2/fec.c
@@ -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)
 {

diff --git a/cpu/mpc5xxx/ide.c b/cpu/mpc5xxx/ide.c
index 29b99f6b15ddada936f3b3226dfdddf0e2d5098d..087ddac109dbef5d108a8a09e3b22cb9a153dd3f 100644 (file)
--- a/cpu/mpc5xxx/ide.c
+++ b/cpu/mpc5xxx/ide.c
@@ -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

diff --git a/cpu/mpc8260/ether_fcc.c b/cpu/mpc8260/ether_fcc.c
index 08d2847b96bf2a4d4bc3c1c2e97596850c4ede0a..37bf4456ed1b032a892abced7dffb7c138943d39 100644 (file)
--- a/cpu/mpc8260/ether_fcc.c
+++ b/cpu/mpc8260/ether_fcc.c
@@ -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

diff --git a/cpu/mpc8260/ether_scc.c b/cpu/mpc8260/ether_scc.c
index b9ae08266878e4e14f69fd1586d756ac38494d5a..e56839d3aad020be2eb54c4f964774739dcfa7db 100644 (file)
--- a/cpu/mpc8260/ether_scc.c
+++ b/cpu/mpc8260/ether_scc.c
@@ -353,4 +353,4 @@ void restart(void)
 }
 #endif
 
-#endif  /* CONFIG_ETHER_ON_SCC && CFG_CMD_NET */
+#endif

diff --git a/cpu/mpc8260/kgdb.S b/cpu/mpc8260/kgdb.S
index 5a7d0b7b2bbfa6695f2cf9d550f6a53d6858a0da..dae87bb97c77f0eff6596619f2da42d70f3c84c4 100644 (file)
--- a/cpu/mpc8260/kgdb.S
+++ b/cpu/mpc8260/kgdb.S
@@ -69,4 +69,4 @@ kgdb_flush_cache_range:
        SYNC
        blr
 
-#endif /* CFG_CMD_KGDB */
+#endif

diff --git a/cpu/mpc85xx/ether_fcc.c b/cpu/mpc85xx/ether_fcc.c
index 4448cc3b8f58dd047dfd59c63238933bab733832..5b23a80e1ca9892d3ec94cde83e0985eb563b75d 100644 (file)
--- a/cpu/mpc85xx/ether_fcc.c
+++ b/cpu/mpc85xx/ether_fcc.c
@@ -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 */

diff --git a/cpu/mpc8xx/fec.c b/cpu/mpc8xx/fec.c
index 10d825f57297b3bb48e5cb4ec2655a2cef222c5b..08a3715812dc2ccda643fae2af38d0504fa01ebf 100644 (file)
--- a/cpu/mpc8xx/fec.c
+++ b/cpu/mpc8xx/fec.c
@@ -1022,4 +1022,4 @@ int fec8xx_miiphy_write(char *devname, unsigned char  addr,
 }
 #endif
 
-#endif /* CFG_CMD_NET, FEC_ENET */
+#endif

diff --git a/cpu/mpc8xx/kgdb.S b/cpu/mpc8xx/kgdb.S
index d4c77e796689c0900a26c662c4108caf8705faf2..812baa3ecd4d5158f2e2e73fc19f9a2417452759 100644 (file)
--- a/cpu/mpc8xx/kgdb.S
+++ b/cpu/mpc8xx/kgdb.S
@@ -71,4 +71,4 @@ kgdb_flush_cache_range:
        SYNC
        blr
 
-#endif /* CFG_CMD_KGDB */
+#endif

diff --git a/cpu/mpc8xx/scc.c b/cpu/mpc8xx/scc.c
index a0ec5d787061f7b1501679c9b71a396665b449e2..744dcdde91f2e198bfd49428ff5ef1f9e733c61e 100644 (file)
--- a/cpu/mpc8xx/scc.c
+++ b/cpu/mpc8xx/scc.c
@@ -567,4 +567,4 @@ void restart (void)
                (SCC_GSMRL_ENR | SCC_GSMRL_ENT);
 }
 #endif
-#endif /* CFG_CMD_NET, SCC_ENET */
+#endif

diff --git a/cpu/mpc8xx/serial.c b/cpu/mpc8xx/serial.c
index 6e08b53525bc82999d89d05f0f0c112aab6a5322..68804cc43945012667604feef865f1dba4ffcc1a 100644 (file)
--- a/cpu/mpc8xx/serial.c
+++ b/cpu/mpc8xx/serial.c
@@ -723,6 +723,6 @@ kgdb_interruptible (int yes)
 {
        return;
 }
-#endif /* CFG_CMD_KGDB */
+#endif
 
 #endif /* CONFIG_8xx_CONS_NONE */

diff --git a/cpu/ppc4xx/dcr.S b/cpu/ppc4xx/dcr.S
index fe136e0fa292a875f99db5d329e66630900120b1..93465a3b513759074819bd4877eec4f472b067a7 100644 (file)
--- a/cpu/ppc4xx/dcr.S
+++ b/cpu/ppc4xx/dcr.S
@@ -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

diff --git a/cpu/ppc4xx/kgdb.S b/cpu/ppc4xx/kgdb.S
index cd12727be3c73f34fc81ce0646fd65dbfd1b2b16..8c4bbf2e4de35dd908e8c1b5bd94ac281005e2cf 100644 (file)
--- a/cpu/ppc4xx/kgdb.S
+++ b/cpu/ppc4xx/kgdb.S
@@ -75,4 +75,4 @@ kgdb_flush_cache_range:
        SYNC
        blr
 
-#endif /* CFG_CMD_KGDB */
+#endif

diff --git a/cpu/ppc4xx/serial.c b/cpu/ppc4xx/serial.c
index aefa4cabab6540e83d8b1759e19d3098e7ca5404..3f67136be5334d18c52441f866661d2fde97a1a4 100644 (file)
--- a/cpu/ppc4xx/serial.c
+++ b/cpu/ppc4xx/serial.c
@@ -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)

diff --git a/include/_exports.h b/include/_exports.h
index eeb65f40ae46b4546b14e66fc3daaeda9dbe1369..a0fbf2aba3621cbf92c9c697174e457982a8e8aa 100644 (file)
--- a/include/_exports.h
+++ b/include/_exports.h
@@ -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

diff --git a/include/exports.h b/include/exports.h
index ad20502a67a72cf7fe8e85461fd78083668c521f..704b1330b891a1d8c42c26febc1b0fca4cf03774 100644 (file)
--- a/include/exports.h
+++ b/include/exports.h
@@ -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 **);
 

diff --git a/include/pcmcia.h b/include/pcmcia.h
index c028ab735db4eb53c5d01dece5e27bae2bff9de3..7305805e40c39fd3b16f17a6c67d20da8fa935be 100644 (file)
--- a/include/pcmcia.h
+++ b/include/pcmcia.h
@@ -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[];

diff --git a/rtc/bf5xx_rtc.c b/rtc/bf5xx_rtc.c
index 17a19eb4f1d41669a60bc72ca63e8f661d83c31c..8856bb9b5f84a49387c8b2175ec8548d4dd1b5b4 100644 (file)
--- a/rtc/bf5xx_rtc.c
+++ b/rtc/bf5xx_rtc.c
@@ -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

diff --git a/rtc/date.c b/rtc/date.c
index d00b1444807f4b8510251a862cb5168e345eab1a..a83a7235ab619a333b41c3cd74eb63ee0648eb19 100644 (file)
--- a/rtc/date.c
+++ b/rtc/date.c
@@ -153,4 +153,4 @@ mktime (unsigned int year, unsigned int mon,
        )*60 + sec; /* finally seconds */
 }
 
-#endif /* CFG_CMD_DATE */
+#endif

diff --git a/rtc/ds1307.c b/rtc/ds1307.c
index a2a86337848723740cf7889140a43698009ba785..c882d7989a097ba7a62599d5ad028d1c728c71d8 100644 (file)
--- a/rtc/ds1307.c
+++ b/rtc/ds1307.c
@@ -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

diff --git a/rtc/ds1337.c b/rtc/ds1337.c
index b871d07950209438c1eed4c6f38e348c363fad3a..c636ac5948f718879a3bd11ebaa588d24a9dc856 100644 (file)
--- a/rtc/ds1337.c
+++ b/rtc/ds1337.c
@@ -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

diff --git a/rtc/ds1374.c b/rtc/ds1374.c
index 6ee7ab4b98076edf0a8f98c9896e93bcd87080d3..e773dd92615fbc32fd6fcbdca1e7faccd5df96c8 100644 (file)
--- a/rtc/ds1374.c
+++ b/rtc/ds1374.c
@@ -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

diff --git a/rtc/ds1556.c b/rtc/ds1556.c
index 440d43aef3b95f15e291406888ad1d8df84f7807..4365cfb9813c39ba36faf45c84b88ba1d7e19187 100644 (file)
--- a/rtc/ds1556.c
+++ b/rtc/ds1556.c
@@ -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

diff --git a/rtc/ds164x.c b/rtc/ds164x.c
index e82ca591636695a49a7a03a4e81ce9c3fddc5a27..bff22b9a058cdc34c5d63d5e1f91357066ea0bac 100644 (file)
--- a/rtc/ds164x.c
+++ b/rtc/ds164x.c
@@ -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

diff --git a/rtc/ds174x.c b/rtc/ds174x.c
index e3028e2540be6e323cf461e2b8e04a6e15c7d6a7..5f85a68170bb002560084b34a3c8949bef812c2f 100644 (file)
--- a/rtc/ds174x.c
+++ b/rtc/ds174x.c
@@ -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

diff --git a/rtc/m41t11.c b/rtc/m41t11.c
index 1e35b068e61f91237a52bf6e515171e4f8da7b50..81da33a31e1879d0a47c5e7290e12e5be308c37e 100644 (file)
--- a/rtc/m41t11.c
+++ b/rtc/m41t11.c
@@ -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

diff --git a/rtc/m48t35ax.c b/rtc/m48t35ax.c
index 6133b46acd410bb0fa3f77d4c90d2a93d52634ac..0a0ffa8aac12fd9844037c78e91f947ea790a853 100644 (file)
--- a/rtc/m48t35ax.c
+++ b/rtc/m48t35ax.c
@@ -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

diff --git a/rtc/max6900.c b/rtc/max6900.c
index 63f643c1a715a2e42c0a043269a0cd4928f17233..c75a8e04c244b1b1216292ae5de03a8ad2730fcb 100644 (file)
--- a/rtc/max6900.c
+++ b/rtc/max6900.c
@@ -128,4 +128,4 @@ void rtc_reset (void)
 {
 }
 
-#endif /* CONFIG_RTC_MAX6900 && CFG_CMD_DATE */
+#endif

diff --git a/rtc/mc146818.c b/rtc/mc146818.c
index bbb6486cf9279fb92c77b7d1c5bdded04a659411..ab377ed73e567d985d6423600cc074cff475e603 100644 (file)
--- a/rtc/mc146818.c
+++ b/rtc/mc146818.c
@@ -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

diff --git a/rtc/mpc5xxx.c b/rtc/mpc5xxx.c
index 72f3111957ecce357e52b857ac06f57f8f6959f6..216386aba052efcd48953e71a3b25825f254baa4 100644 (file)
--- a/rtc/mpc5xxx.c
+++ b/rtc/mpc5xxx.c
@@ -137,4 +137,4 @@ void rtc_reset (void)
        return; /* nothing to do */
 }
 
-#endif /* CONFIG_RTC_MPC5200 && CFG_CMD_DATE */
+#endif

diff --git a/rtc/mpc8xx.c b/rtc/mpc8xx.c
index 716cd53eac44625062edcce962d5eb39fc76f7a1..8d10c0e465e4028bf4fbc4dd2a9f84d3800617e5 100644 (file)
--- a/rtc/mpc8xx.c
+++ b/rtc/mpc8xx.c
@@ -70,6 +70,4 @@ void rtc_reset (void)
        return; /* nothing to do */
 }
 
-/* ------------------------------------------------------------------------- */
-
-#endif /* CONFIG_RTC_MPC8xx && CFG_CMD_DATE */
+#endif

diff --git a/rtc/pcf8563.c b/rtc/pcf8563.c
index 5e868367c8ceb0b6aa8a1301ee28c9707e43bf73..2d73d5d7ef965728dc6d4781d951ca0813351ce5 100644 (file)
--- a/rtc/pcf8563.c
+++ b/rtc/pcf8563.c
@@ -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

diff --git a/rtc/s3c24x0_rtc.c b/rtc/s3c24x0_rtc.c
index 902b737410a5c24b00920c5ba62382719e058de2..7f8b4fad0dda66489a0828b16110ed9cc533b8e9 100644 (file)
--- a/rtc/s3c24x0_rtc.c
+++ b/rtc/s3c24x0_rtc.c
@@ -175,6 +175,4 @@ void rtc_reset (void)
        rtc->RTCCON &= ~(0x08|0x01);
 }
 
-/* ------------------------------------------------------------------------- */
-
-#endif /* CONFIG_RTC_S3C24X0 && CFG_CMD_DATE */
+#endif