diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-07 09:02:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-07 09:02:28 -0400 |
| commit | 69bf66ad8c0d53cc5e64d0f4f2e3bc9ad18e61aa (patch) | |
| tree | b89bafeea8ed15b1403edf892964adaa5003255d /include/eeprom.h | |
| parent | 1259567ae3cd4c84acb9db6ab1fadcdcd26968a9 (diff) | |
| parent | 5168d7a6264be30f82c1c074e43c24fcacbb4283 (diff) | |
Merge branch '2020-05-06-master-imports'
- ARM Juno updates
- Assorted bugfixes
Diffstat (limited to 'include/eeprom.h')
| -rw-r--r-- | include/eeprom.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/eeprom.h b/include/eeprom.h index 79118eb83d..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,8 @@ 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) |