summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpu/74xx_7xx/kgdb.S2
-rw-r--r--cpu/i386/serial.c2
-rw-r--r--cpu/mcf52x2/fec.c2
-rw-r--r--cpu/mpc5xxx/ide.c4
-rw-r--r--cpu/mpc8260/ether_fcc.c2
-rw-r--r--cpu/mpc8260/ether_scc.c2
-rw-r--r--cpu/mpc8260/kgdb.S2
-rw-r--r--cpu/mpc85xx/ether_fcc.c2
-rw-r--r--cpu/mpc8xx/fec.c2
-rw-r--r--cpu/mpc8xx/kgdb.S2
-rw-r--r--cpu/mpc8xx/scc.c2
-rw-r--r--cpu/mpc8xx/serial.c2
-rw-r--r--cpu/ppc4xx/dcr.S2
-rw-r--r--cpu/ppc4xx/kgdb.S2
-rw-r--r--cpu/ppc4xx/serial.c2
-rw-r--r--include/_exports.h2
-rw-r--r--include/exports.h2
-rw-r--r--include/pcmcia.h2
-rw-r--r--rtc/bf5xx_rtc.c2
-rw-r--r--rtc/date.c2
-rw-r--r--rtc/ds1307.c2
-rw-r--r--rtc/ds1337.c2
-rw-r--r--rtc/ds1374.c2
-rw-r--r--rtc/ds1556.c2
-rw-r--r--rtc/ds164x.c2
-rw-r--r--rtc/ds174x.c2
-rw-r--r--rtc/m41t11.c2
-rw-r--r--rtc/m48t35ax.c2
-rw-r--r--rtc/max6900.c2
-rw-r--r--rtc/mc146818.c2
-rw-r--r--rtc/mpc5xxx.c2
-rw-r--r--rtc/mpc8xx.c4
-rw-r--r--rtc/pcf8563.c2
-rw-r--r--rtc/s3c24x0_rtc.c4
34 files changed, 35 insertions, 39 deletions
diff --git a/cpu/74xx_7xx/kgdb.S b/cpu/74xx_7xx/kgdb.S
index cd8869c20..4f231228c 100644
--- 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 4933d23fd..baf35e53d 100644
--- 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 255b3d8b7..ef9c7984c 100644
--- 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 29b99f6b1..087ddac10 100644
--- 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 08d2847b9..37bf4456e 100644
--- 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 b9ae08266..e56839d3a 100644
--- 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 5a7d0b7b2..dae87bb97 100644
--- 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 4448cc3b8..5b23a80e1 100644
--- 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 10d825f57..08a371581 100644
--- 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 d4c77e796..812baa3ec 100644
--- 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 a0ec5d787..744dcdde9 100644
--- 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 6e08b5352..68804cc43 100644
--- 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 fe136e0fa..93465a3b5 100644
--- 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 cd12727be..8c4bbf2e4 100644
--- 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 aefa4caba..3f67136be 100644
--- 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 eeb65f40a..a0fbf2aba 100644
--- 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 ad20502a6..704b1330b 100644
--- 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 c028ab735..7305805e4 100644
--- 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 17a19eb4f..8856bb9b5 100644
--- 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 d00b14448..a83a7235a 100644
--- 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 a2a863378..c882d7989 100644
--- 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 b871d0795..c636ac594 100644
--- 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 6ee7ab4b9..e773dd926 100644
--- 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 440d43aef..4365cfb98 100644
--- 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 e82ca5916..bff22b9a0 100644
--- 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 e3028e254..5f85a6817 100644
--- 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 1e35b068e..81da33a31 100644
--- 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 6133b46ac..0a0ffa8aa 100644
--- 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 63f643c1a..c75a8e04c 100644
--- 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 bbb6486cf..ab377ed73 100644
--- 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 72f311195..216386aba 100644
--- 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 716cd53ea..8d10c0e46 100644
--- 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 5e868367c..2d73d5d7e 100644
--- 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 902b73741..7f8b4fad0 100644
--- 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 23:35:01 +0000