From 6d0f6bcf337c5261c08fabe12982178c2c489d76 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Thu, 16 Oct 2008 15:01:15 +0200 Subject: rename CFG_ macros to CONFIG_SYS Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- include/i2c.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'include/i2c.h') diff --git a/include/i2c.h b/include/i2c.h index 9f771dd..8d6f867 100644 --- a/include/i2c.h +++ b/include/i2c.h @@ -47,31 +47,31 @@ #define I2C_RXTX_LEN 128 /* maximum tx/rx buffer length */ #if defined(CONFIG_I2C_MULTI_BUS) -#define CFG_MAX_I2C_BUS 2 +#define CONFIG_SYS_MAX_I2C_BUS 2 #define I2C_GET_BUS() i2c_get_bus_num() #define I2C_SET_BUS(a) i2c_set_bus_num(a) #else -#define CFG_MAX_I2C_BUS 1 +#define CONFIG_SYS_MAX_I2C_BUS 1 #define I2C_GET_BUS() 0 #define I2C_SET_BUS(a) #endif /* define the I2C bus number for RTC and DTT if not already done */ -#if !defined(CFG_RTC_BUS_NUM) -#define CFG_RTC_BUS_NUM 0 +#if !defined(CONFIG_SYS_RTC_BUS_NUM) +#define CONFIG_SYS_RTC_BUS_NUM 0 #endif -#if !defined(CFG_DTT_BUS_NUM) -#define CFG_DTT_BUS_NUM 0 +#if !defined(CONFIG_SYS_DTT_BUS_NUM) +#define CONFIG_SYS_DTT_BUS_NUM 0 #endif -#if !defined(CFG_SPD_BUS_NUM) -#define CFG_SPD_BUS_NUM 0 +#if !defined(CONFIG_SYS_SPD_BUS_NUM) +#define CONFIG_SYS_SPD_BUS_NUM 0 #endif #ifndef I2C_SOFT_DECLARATIONS # if defined(CONFIG_MPC8260) -# define I2C_SOFT_DECLARATIONS volatile ioport_t *iop = ioport_addr((immap_t *)CFG_IMMR, I2C_PORT); +# define I2C_SOFT_DECLARATIONS volatile ioport_t *iop = ioport_addr((immap_t *)CONFIG_SYS_IMMR, I2C_PORT); # elif defined(CONFIG_8xx) -# define I2C_SOFT_DECLARATIONS volatile immap_t *immr = (immap_t *)CFG_IMMR; +# define I2C_SOFT_DECLARATIONS volatile immap_t *immr = (immap_t *)CONFIG_SYS_IMMR; # else # define I2C_SOFT_DECLARATIONS # endif @@ -81,7 +81,7 @@ * repeatedly to change the speed and slave addresses. */ void i2c_init(int speed, int slaveaddr); -#ifdef CFG_I2C_INIT_BOARD +#ifdef CONFIG_SYS_I2C_INIT_BOARD void i2c_init_board(void); #endif -- cgit v1.1