leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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 <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2007-06-11 19:02:53 -05:00 committed by Wolfgang Denk
parent 6e2115acb6
commit 98b79003c2
22 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtc/bf5xx_rtc.c
View File

@ -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>

2
rtc/date.c
View File

@ -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

2
rtc/ds12887.c
View File

@ -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

2
rtc/ds1302.c
View File

@ -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

2
rtc/ds1306.c
View File

@ -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

2
rtc/ds1307.c
View File

@ -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

2
rtc/ds1337.c
View File

@ -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

2
rtc/ds1374.c
View File

@ -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

2
rtc/ds1556.c
View File

@ -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);

2
rtc/ds164x.c
View File

@ -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);

2
rtc/ds174x.c
View File

@ -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);

2
rtc/ds3231.c
View File

@ -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

2
rtc/m41t11.c
View File

@ -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)
{

2
rtc/m48t35ax.c
View File

@ -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);

2
rtc/max6900.c
View File

@ -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

2
rtc/mc146818.c
View File

@ -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);

2
rtc/mk48t59.c
View File

@ -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)
/* ------------------------------------------------------------------------- */

2
rtc/mpc5xxx.c
View File

@ -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 ...

2
rtc/mpc8xx.c
View File

@ -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))
/* ------------------------------------------------------------------------- */

2
rtc/pcf8563.c
View File

@ -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);

2
rtc/rs5c372.c
View File

@ -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.

2
rtc/s3c24x0_rtc.c
View File

@ -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>