[U-Boot] [PATCH] Revert "common, env: Fix support for environment in i2c eeprom"

Matthias Fuchs
2014-10-14T12:32:19Z

Hi Valentin,

my patch fixed environment from i2c eeprom. I am not sure on which board
I ran into that trouble. Probably PMC440. So reverting my former patch
will break environment in i2c eeprom again on many boards.

But perhaps there's a better way to fix that.

Matthias

On 10/14/2014 11:16 AM, Valentin Longchamp wrote:
> 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>
>
> ---
>
> common/cmd_eeprom.c | 9 ++-------
> 1 file 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
> }
>
>

--
------------------------------------------------------------------------
Dipl.-Ing. Matthias Fuchs
Head of System Design

esd electronic system design gmbh
Vahrenwalder Str. 207 - 30165 Hannover - GERMANY
Phone: +49-511-37298-0 - Fax: +49-511-37298-68
Please visit our homepage http://www.esd.eu
Quality Products - Made in Germany
-------------------------------------------------------------------------
Gesch?ftsf?hrer: Klaus Detering
Amtsgericht Hannover HRB 51373 - VAT-ID DE 115672832
-------------------------------------------------------------------------