diff options
| author | Tom Rini <trini@ti.com> | 2013-07-24 09:22:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-24 09:50:24 -0400 |
| commit | c2120fbfbc4d1f6953228f86be8bdbf38bacfdab (patch) | |
| tree | 14cd8ec9a0a61f7113149be38d79808cd5e955f8 /board/cm5200 | |
| parent | e85427fd66a21b39145a47e67871a8863c0e5591 (diff) | |
| parent | ecbd7e1ec7280d90d151a99691f74b892588cadd (diff) | |
| download | blackbird-obmc-uboot-c2120fbfbc4d1f6953228f86be8bdbf38bacfdab.tar.gz blackbird-obmc-uboot-c2120fbfbc4d1f6953228f86be8bdbf38bacfdab.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
The sandburst-specific i2c drivers have been deleted, conflict was just
over the SPDX conversion.
Conflicts:
board/sandburst/common/ppc440gx_i2c.c
board/sandburst/common/ppc440gx_i2c.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/cm5200')
| -rw-r--r-- | board/cm5200/cm5200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index 58f5a36f81..e391dfc9e1 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -309,7 +309,7 @@ int board_early_init_r(void) #ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { -#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) uchar buf[6]; char str[18]; char hostname[MODULE_NAME_MAXLEN]; @@ -332,7 +332,7 @@ int misc_init_r(void) " device at address %02X:%04X\n", CONFIG_SYS_I2C_EEPROM, CONFIG_MAC_OFFSET); } -#endif /* defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) */ +#endif /* defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) */ if (!getenv("ethaddr")) printf(LOG_PREFIX "MAC address not set, networking is not " "operational\n"); |
