summaryrefslogtreecommitdiff
path: root/common/cmd_eeprom.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-11-10 20:53:22 +0100
committerTom Rini <trini@konsulko.com>2015-11-21 21:50:22 -0500
commit53a85ad79adb43fac2a57cfd241450a9d2f4ce42 (patch)
treefd84e76047568cd7269eb3fa1d24e9e19f117281 /common/cmd_eeprom.c
parentb7b2e3f74887beebc74fecf3a8468e1833351342 (diff)
downloadu-boot-imx-53a85ad79adb43fac2a57cfd241450a9d2f4ce42.zip
u-boot-imx-53a85ad79adb43fac2a57cfd241450a9d2f4ce42.tar.gz
u-boot-imx-53a85ad79adb43fac2a57cfd241450a9d2f4ce42.tar.bz2
eeprom: Zap CONFIG_SPI_X
This macro is no longer used, so just reap it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Tom Rini <trini@konsulko.com> Cc: Simon Glass <sjg@chromium.org> Cc: Heiko Schocher <hs@denx.de> Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'common/cmd_eeprom.c')
-rw-r--r--common/cmd_eeprom.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/common/cmd_eeprom.c b/common/cmd_eeprom.c
index ea1d447..728606e 100644
--- a/common/cmd_eeprom.c
+++ b/common/cmd_eeprom.c
@@ -78,7 +78,7 @@ int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt
unsigned maxlen;
#endif
-#if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1 && !defined(CONFIG_SPI_X)
+#if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1
uchar addr[2];
blk_off = offset & 0xFF; /* block offset */
@@ -95,7 +95,7 @@ int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt
addr[1] = offset >> 8; /* upper address octet */
addr[2] = blk_off; /* lower address octet */
alen = 3;
-#endif /* CONFIG_SYS_I2C_EEPROM_ADDR_LEN, CONFIG_SPI_X */
+#endif /* CONFIG_SYS_I2C_EEPROM_ADDR_LEN */
addr[0] |= dev_addr; /* insert device address */
@@ -151,7 +151,7 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn
unsigned maxlen;
#endif
-#if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1 && !defined(CONFIG_SPI_X)
+#if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1
uchar addr[2];
blk_off = offset & 0xFF; /* block offset */
@@ -168,7 +168,7 @@ int eeprom_write (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cn
addr[1] = offset >> 8; /* upper address octet */
addr[2] = blk_off; /* lower address octet */
alen = 3;
-#endif /* CONFIG_SYS_I2C_EEPROM_ADDR_LEN, CONFIG_SPI_X */
+#endif /* CONFIG_SYS_I2C_EEPROM_ADDR_LEN */
addr[0] |= dev_addr; /* insert device address */