summaryrefslogtreecommitdiffstats
path: root/common/env_eeprom.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-11-10 20:53:31 +0100
committerTom Rini <trini@konsulko.com>2015-11-21 21:50:26 -0500
commit354e3ed754fea744ff412b1e015b696db08320e3 (patch)
treeb46abf0507aac3f67b8940660fd60cb2612bb828 /common/env_eeprom.c
parent1a37889b0ad084a740b4f785031d7ae9955d947b (diff)
downloadblackbird-obmc-uboot-354e3ed754fea744ff412b1e015b696db08320e3.tar.gz
blackbird-obmc-uboot-354e3ed754fea744ff412b1e015b696db08320e3.zip
eeprom: Add bus argument to eeprom_init()
Add bus argument to eeprom_init(), so that it can select the I2C bus number on which the eeprom resides. Any negative value of the $bus argument will preserve the old behavior. This is in place so that old code does not randomly break. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Simon Glass <sjg@chromium.org> Cc: Tom Rini <trini@konsulko.com> Cc: Heiko Schocher <hs@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de> [trini: Wrap i2c_set_bus_num() call with CONFIG_SYS_I2C test] Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common/env_eeprom.c')
-rw-r--r--common/env_eeprom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/env_eeprom.c b/common/env_eeprom.c
index eea169d484..72b13734f2 100644
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@@ -91,7 +91,7 @@ void env_relocate_spec(void)
uchar rdbuf[64], flags[2];
int i, crc_ok[2] = {0, 0};
- eeprom_init(); /* prepare for EEPROM read/write */
+ eeprom_init(-1); /* prepare for EEPROM read/write */
off_env[0] = CONFIG_ENV_OFFSET;
off_env[1] = CONFIG_ENV_OFFSET_REDUND;
@@ -154,7 +154,7 @@ void env_relocate_spec(void)
ulong crc, len, new;
uchar rdbuf[64];
- eeprom_init(); /* prepare for EEPROM read/write */
+ eeprom_init(-1); /* prepare for EEPROM read/write */
/* read old CRC */
eeprom_bus_read(CONFIG_SYS_DEF_EEPROM_ADDR,
OpenPOWER on IntegriCloud