summaryrefslogtreecommitdiff
path: root/common/cmd_eeprom.c
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@keymile.com>2014-10-14 11:16:33 +0200
committerTom Rini <trini@ti.com>2014-10-27 11:04:00 -0400
commit4bf3a56f2b2c7c7bbf3825484d361d564a270783 (patch)
tree435218aa094499eccc26379685519ed2e95c7bf2 /common/cmd_eeprom.c
parentbe9445c0d44751e5da3c78fbe07cf73e5f40184b (diff)
downloadu-boot-imx-4bf3a56f2b2c7c7bbf3825484d361d564a270783.zip
u-boot-imx-4bf3a56f2b2c7c7bbf3825484d361d564a270783.tar.gz
u-boot-imx-4bf3a56f2b2c7c7bbf3825484d361d564a270783.tar.bz2
Revert "common, env: Fix support for environment in i2c eeprom"
Since i2c_init_all always sets the bus back to CONFIG_SYS_SPD_BUS_NUM for compatibility reasons, it means that any eeprom not located on this CONFIG_SYS_SPD_BUS_NUM is not accessible with the eeprom commands, even if you change the bus number with an i2c dev command before. Furthermore i2c_init_all should disappear and is currently only called from the early board initialisation sequences, it is not suited for other usage. This reverts commit 01a0c64762e902971b34587a8a61b59e9ea51374. Signed-off-by: Valentin Longchamp <valentin.longchamp@keymile.com> Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>
Diffstat (limited to 'common/cmd_eeprom.c')
-rw-r--r--common/cmd_eeprom.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index a02f0cb..29f0f1f 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -389,13 +389,8 @@ 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) || \
- defined(CONFIG_SYS_I2C)
-#ifdef CONFIG_SYS_I2C
- i2c_init_all();
-#else
- i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
-#endif
+#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C_SOFT)
+ i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
#endif
}