diff options
| author | Matthias Fuchs <matthias.fuchs@esd.eu> | 2014-03-19 10:25:08 +0100 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-03-28 15:06:30 -0400 |
| commit | 01a0c64762e902971b34587a8a61b59e9ea51374 (patch) | |
| tree | 823fa2e8f6f820cf12df8070ae69e6fbd4e3ff75 /common/cmd_eeprom.c | |
| parent | 17b0da801910b2791cf67817735a3367615922e6 (diff) | |
| download | u-boot-imx-01a0c64762e902971b34587a8a61b59e9ea51374.zip u-boot-imx-01a0c64762e902971b34587a8a61b59e9ea51374.tar.gz u-boot-imx-01a0c64762e902971b34587a8a61b59e9ea51374.tar.bz2 | |
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>
Diffstat (limited to 'common/cmd_eeprom.c')
| -rw-r--r-- | common/cmd_eeprom.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c index 3924805..fad462f 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 } |