diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
| commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
| tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /board/cm5200/cmd_cm5200.c | |
| parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
| parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
| download | olio-uboot-2014.01-f82642e33899766892499b163e60560fbbf87773.tar.xz olio-uboot-2014.01-f82642e33899766892499b163e60560fbbf87773.zip | |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'board/cm5200/cmd_cm5200.c')
| -rw-r--r-- | board/cm5200/cmd_cm5200.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/cm5200/cmd_cm5200.c b/board/cm5200/cmd_cm5200.c index 2201bdd8c..00f0671d7 100644 --- a/board/cm5200/cmd_cm5200.c +++ b/board/cm5200/cmd_cm5200.c @@ -39,18 +39,18 @@ int do_i2c(char *argv[]) getc(); temp = 0xf0; /* set io 0-4 as output */ - i2c_write(CFG_I2C_IO, 3, 1, (uchar *)&temp, 1); + i2c_write(CONFIG_SYS_I2C_IO, 3, 1, (uchar *)&temp, 1); printf("Press I2C4-7. LED I2C0-3 should have the same state\n\n" "Press any key to stop\n\n"); while (!tstc()) { - i2c_read(CFG_I2C_IO, 0, 1, (uchar *)&temp, 1); + i2c_read(CONFIG_SYS_I2C_IO, 0, 1, (uchar *)&temp, 1); temp1 = (temp >> 4) & 0x03; temp1 |= (temp >> 3) & 0x08; /* S302 -> LED303 */ temp1 |= (temp >> 5) & 0x04; /* S303 -> LED302 */ temp = temp1; - i2c_write(CFG_I2C_IO, 1, 1, (uchar *)&temp, 1); + i2c_write(CONFIG_SYS_I2C_IO, 1, 1, (uchar *)&temp, 1); } getc(); @@ -392,7 +392,7 @@ int do_rs232(char *argv[]) error_status = 1; break; } - gpio->port_config |= (CFG_GPS_PORT_CONFIG & 0xFF0FF80F); + gpio->port_config |= (CONFIG_SYS_GPS_PORT_CONFIG & 0xFF0FF80F); return error_status; } |