summaryrefslogtreecommitdiff
path: root/board/cm5200/cm5200.c
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2013-01-29 08:53:15 +0100
committerHeiko Schocher <hs@denx.de>2013-07-23 05:54:29 +0200
commitea818dbbcd59300b56014ac2d67798a54994eb9b (patch)
treefbdedc80f785873f96e79893a1a813504af57580 /board/cm5200/cm5200.c
parent3f4978c713255c8406875fbdf23ffed1129bc44b (diff)
downloadu-boot-imx-ea818dbbcd59300b56014ac2d67798a54994eb9b.zip
u-boot-imx-ea818dbbcd59300b56014ac2d67798a54994eb9b.tar.gz
u-boot-imx-ea818dbbcd59300b56014ac2d67798a54994eb9b.tar.bz2
i2c, soft-i2c: switch to new multibus/multiadapter support
- added to soft_i2c driver new multibus/multiadpater support - adapted all config files, which uses this driver Signed-off-by: Heiko Schocher <hs@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'board/cm5200/cm5200.c')
-rw-r--r--board/cm5200/cm5200.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c
index c0ea1c6..ad50452 100644
--- a/board/cm5200/cm5200.c
+++ b/board/cm5200/cm5200.c
@@ -325,7 +325,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];
@@ -348,7 +348,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");