aboutsummaryrefslogtreecommitdiff
path: root/include/common.h
diff options
context:
space:
mode:
authorHeiko Schocher <hs@denx.de>2010-01-07 08:55:40 +0100
committerWolfgang Denk <wd@denx.de>2010-01-18 00:42:37 +0100
commit548738b4d43af841ff58c787bce297ac6a8bf7d1 (patch)
tree2d703671e76278a06143bc68e0436ae59e642552 /include/common.h
parentb63815e31355b44e65899b361da1d8ef6940ab90 (diff)
cmd_eeprom: I2C updates
- CONFIG_ENV_EEPROM_IS_ON_I2C define this, if you have I2C and SPI activated, and your EEPROM, which holds the environment, is on the I2C bus. - CONFIG_I2C_ENV_EEPROM_BUS if you have an Environment on an EEPROM reached over I2C muxes, you can now define, how to reach this EEPROM. Signed-off-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'include/common.h')
-rw-r--r--include/common.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index 8197508b6..391790a41 100644
--- a/include/common.h
+++ b/include/common.h
@@ -336,7 +336,9 @@ extern void pic_write (uchar reg, uchar val);
#if defined(CONFIG_SPI) || !defined(CONFIG_SYS_I2C_EEPROM_ADDR)
# define CONFIG_SYS_DEF_EEPROM_ADDR 0
#else
+#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
+#endif
#endif /* CONFIG_SPI || !defined(CONFIG_SYS_I2C_EEPROM_ADDR) */
#if defined(CONFIG_SPI)