From: Matthias Fuchs <matthias.fuchs@esd.eu>
Date: Wed, 19 Mar 2014 09:25:08 +0000 (+0100)
Subject: common, env: Fix support for environment in i2c eeprom
X-Git-Tag: v2014.04-rc3~15
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=01a0c64762e902971b34587a8a61b59e9ea51374;p=oweals%2Fu-boot.git

common, env: Fix support for environment in i2c eeprom

When using CONFIG_SYS_I2C i2c needs to be initialized by
i2c_init_all(). This is done in some places but not in
eeprom_init().

Signed-off-by: Matthias Fuchs <matthias.fuchs@esd.eu>
---

diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index 39248054f8..fad462fb34 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -389,8 +389,13 @@ void eeprom_init  (void)
 #if defined(CONFIG_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
 	spi_init_f ();
 #endif
-#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT)
-	i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT) || \
+	defined(CONFIG_SYS_I2C)
+#ifdef CONFIG_SYS_I2C
+	i2c_init_all();
+#else
+	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#endif
 #endif
 }