X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Feeprom.h;h=6820844cea3ae2bdfbdba0e72f29bb168741235c;hb=07693ccb1574adecb9e87756339442955aeaf346;hp=61eb826a7345994b20f57b23b3b311f8edc390f4;hpb=a4ef0657e3075d0f951d78cc1398cb7e05af648a;p=oweals%2Fu-boot.git

diff --git a/include/eeprom.h b/include/eeprom.h
index 61eb826a73..6820844cea 100644
--- a/include/eeprom.h
+++ b/include/eeprom.h
@@ -7,7 +7,7 @@
 #ifndef __EEPROM_LEGACY_H
 #define __EEPROM_LEGACY_H
 
-#ifdef CONFIG_CMD_EEPROM
+#if defined(CONFIG_CMD_EEPROM) || defined(CONFIG_ENV_IS_IN_EEPROM)
 void eeprom_init(int bus);
 int eeprom_read(uint dev_addr, uint offset, uchar *buffer, uint cnt);
 int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);
@@ -17,8 +17,12 @@ int eeprom_write(uint dev_addr, uint offset, uchar *buffer, uint cnt);
  * some macros here so we don't have to touch every one of those uses
  */
 #define eeprom_init(bus)
-#define eeprom_read(dev_addr, offset, buffer, cnt) ((void)-ENOSYS)
-#define eeprom_write(dev_addr, offset, buffer, cnt) ((void)-ENOSYS)
+#define eeprom_read(dev_addr, offset, buffer, cnt) (-ENOSYS)
+#define eeprom_write(dev_addr, offset, buffer, cnt) (-ENOSYS)
+#endif
+
+#if !defined(CONFIG_ENV_EEPROM_IS_ON_I2C) && defined(CONFIG_SYS_I2C_EEPROM_ADDR)
+# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
 #endif
 
 #endif