rtc/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

PATCH New Jon Loeliger 1 participant 1 message Jun 12, 2007

Share & tools

Jon Loeliger

author

2007-06-12 00:02 UTC #0 lore raw

PATCH 9/19 rtc/: Augment CONFIG_COMMANDS tests with defined(CONFIG_CMD_*).

This is a compatibility step that allows both the older form and the new form to co-exist for a while until the older can be removed entirely.

All transformations are of the form:
Before:

    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT)
After:
    #if (CONFIG_COMMANDS & CFG_CMD_AUTOSCRIPT) || defined(CONFIG_CMD_AUTOSCRIPT)

Signed-off-by Jon Loeliger <[email protected]>

---
 rtc/bf5xx_rtc.c   |    2 +-
 rtc/date.c        |    2 +-
 rtc/ds12887.c     |    2 +-
 rtc/ds1302.c      |    2 +-
 rtc/ds1306.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/ds3231.c      |    2 +-
 rtc/m41t11.c      |    2 +-
 rtc/m48t35ax.c    |    2 +-
 rtc/max6900.c     |    2 +-
 rtc/mc146818.c    |    2 +-
 rtc/mk48t59.c     |    2 +-
 rtc/mpc5xxx.c     |    2 +-
 rtc/mpc8xx.c      |    2 +-
 rtc/pcf8563.c     |    2 +-
 rtc/rs5c372.c     |    2 +-
 rtc/s3c24x0_rtc.c |    2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

rtc/bf5xx_rtc.c +1 -1

index 85bbb56..b10be81 100644
@@ -49,7 +49,7 @@
 #include <command.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_BFIN) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_BFIN) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 #include <asm/blackfin.h>
 #include <asm/arch/bf5xx_rtc.h>

rtc/date.c +1 -1

index b5f8c48..17d870f 100644
@@ -29,7 +29,7 @@
 #include <command.h>
 #include <rtc.h>
 
-#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
+#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE) || defined(CONFIG_TIMESTAMP)
 
 #define FEBRUARY		2
 #define	STARTOFTIME		1970

rtc/ds12887.c +1 -1

index 8b12893..60382a1 100644
@@ -28,7 +28,7 @@
 #include <config.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_DS12887) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS12887) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 #define RTC_SECONDS			0x00
 #define RTC_SECONDS_ALARM		0x01

rtc/ds1302.c +1 -1

index 98dce89..908cc7c 100644
@@ -9,7 +9,7 @@
 #include <command.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_DS1302) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS1302) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 /* GPP Pins */
 #define DATA		0x200

rtc/ds1306.c +1 -1

index e01e1ce..08622fb 100644
@@ -36,7 +36,7 @@
 #include <rtc.h>
 #include <spi.h>
 
-#if defined(CONFIG_RTC_DS1306) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS1306) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 #define	RTC_SECONDS		0x00
 #define	RTC_MINUTES		0x01

rtc/ds1307.c +1 -1

index 3b26a0a..79201a1 100644
@@ -36,7 +36,7 @@
 #include <i2c.h>
 
 #if (defined(CONFIG_RTC_DS1307) || defined(CONFIG_RTC_DS1338) ) && \
-    (CONFIG_COMMANDS & CFG_CMD_DATE)
+    ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC

rtc/ds1337.c +1 -1

index 9f0c8c0..4de4fa3 100644
@@ -32,7 +32,7 @@
 #include <rtc.h>
 #include <i2c.h>
 
-#if defined(CONFIG_RTC_DS1337) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS1337) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC

rtc/ds1374.c +1 -1

index 50a996c..b0dd9dc 100644
@@ -35,7 +35,7 @@
 #include <rtc.h>
 #include <i2c.h>
 
-#if (defined(CONFIG_RTC_DS1374)) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if (defined(CONFIG_RTC_DS1374)) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC

rtc/ds1556.c +1 -1

index dd9ea5e..8d4602a 100644
@@ -37,7 +37,7 @@
 #include <rtc.h>
 
 
-#if defined(CONFIG_RTC_DS1556) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS1556) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 static uchar rtc_read( unsigned int addr );
 static void  rtc_write( unsigned int addr, uchar val);

rtc/ds164x.c +1 -1

index 3cc76ab..36a0fb4 100644
@@ -37,7 +37,7 @@
 #include <rtc.h>
 
 
-#if defined(CONFIG_RTC_DS164x) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS164x) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 static uchar    rtc_read(unsigned int addr );
 static void     rtc_write(unsigned int addr, uchar val);

rtc/ds174x.c +1 -1

index 58b13e9..5261e54 100644
@@ -33,7 +33,7 @@
 #include <command.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_DS174x) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS174x) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 static uchar rtc_read( unsigned int addr );
 static void  rtc_write( unsigned int addr, uchar val);

rtc/ds3231.c +1 -1

index 50aeeb5..208f152 100644
@@ -33,7 +33,7 @@
 #include <rtc.h>
 #include <i2c.h>
 
-#if defined(CONFIG_RTC_DS3231) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_DS3231) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 /*---------------------------------------------------------------------*/
 #undef DEBUG_RTC

rtc/m41t11.c +1 -1

index c725cc9..1f87aef 100644
@@ -43,7 +43,7 @@
 #endif
 */
 
-#if defined(CONFIG_RTC_M41T11) && defined(CFG_I2C_RTC_ADDR) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_M41T11) && defined(CFG_I2C_RTC_ADDR) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 static unsigned bcd2bin (uchar n)
 {

rtc/m48t35ax.c +1 -1

index 6c38a53..f22405b 100644
@@ -33,7 +33,7 @@
 #include <rtc.h>
 #include <config.h>
 
-#if defined(CONFIG_RTC_M48T35A) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_M48T35A) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 static uchar rtc_read  (uchar reg);
 static void  rtc_write (uchar reg, uchar val);

rtc/max6900.c +1 -1

index 73919cd..8bf23d5 100644
@@ -32,7 +32,7 @@
 #include <rtc.h>
 #include <i2c.h>
 
-#if defined(CONFIG_RTC_MAX6900) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_MAX6900) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 #ifndef	CFG_I2C_RTC_ADDR
 #define	CFG_I2C_RTC_ADDR	0x50

rtc/mc146818.c +1 -1

index 20b1b3e..3a29d06 100644
@@ -31,7 +31,7 @@
 #include <command.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_MC146818) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_MC146818) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 static uchar rtc_read  (uchar reg);
 static void  rtc_write (uchar reg, uchar val);

rtc/mk48t59.c +1 -1

index 64f751f..3987e27 100644
@@ -131,7 +131,7 @@ void nvram_write(short dest, const void *src, size_t count)
 		rtc_write(d++, *s++);
 }
 
-#if (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if (CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE)
 
 /* ------------------------------------------------------------------------- */

rtc/mpc5xxx.c +1 -1

index 2053df1..7195af0 100644
@@ -32,7 +32,7 @@
 #include <command.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_MPC5200) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_MPC5200) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 /*****************************************************************************
  * this structure should be defined in mpc5200.h ...

rtc/mpc8xx.c +1 -1

index 830e56e..33f867a 100644
@@ -31,7 +31,7 @@
 #include <command.h>
 #include <rtc.h>
 
-#if defined(CONFIG_RTC_MPC8xx) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_MPC8xx) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 /* ------------------------------------------------------------------------- */

rtc/pcf8563.c +1 -1

index 05ae97e..1dacaa3 100644
@@ -32,7 +32,7 @@
 #include <rtc.h>
 #include <i2c.h>
 
-#if defined(CONFIG_RTC_PCF8563) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_PCF8563) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 static uchar rtc_read  (uchar reg);
 static void  rtc_write (uchar reg, uchar val);

rtc/rs5c372.c +1 -1

index b56808b..6e11710 100644
@@ -34,7 +34,7 @@
 #include <rtc.h>
 #include <i2c.h>
 
-#if defined(CONFIG_RTC_RS5C372A) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_RS5C372A) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 /*
  * Reads are always done starting with register 15, which requires some
  * jumping-through-hoops to access the data correctly.

rtc/s3c24x0_rtc.c +1 -1

index 9e2191e..0b0b160 100644
@@ -28,7 +28,7 @@
 #include <common.h>
 #include <command.h>
 
-#if defined(CONFIG_RTC_S3C24X0) && (CONFIG_COMMANDS & CFG_CMD_DATE)
+#if defined(CONFIG_RTC_S3C24X0) && ((CONFIG_COMMANDS & CFG_CMD_DATE) || defined(CONFIG_CMD_DATE))
 
 #if defined(CONFIG_S3C2400)
 #include <s3c2400.h>

Signature · 1 line

1.5.2.1.239.g75d8