V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Marek Vasut 2015-11-10 20:53:22 +01:00 committed by Tom Rini
parent b7b2e3f748
commit 53a85ad79a
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -2692,11 +2692,6 @@ CBFS (Coreboot Filesystem) support
Enables the driver for SPI controller on SuperH. Currently Enables the driver for SPI controller on SuperH. Currently
only SH7757 is supported. only SH7757 is supported.
CONFIG_SPI_X
Enables extended (16-bit) SPI EEPROM addressing.
(symmetrical to CONFIG_I2C_X)
CONFIG_SOFT_SPI CONFIG_SOFT_SPI
Enables a software (bit-bang) SPI driver rather than Enables a software (bit-bang) SPI driver rather than

8
common/cmd_eeprom.c
View File

@ -78,7 +78,7 @@ int eeprom_read (unsigned dev_addr, unsigned offset, uchar *buffer, unsigned cnt
unsigned maxlen; unsigned maxlen;
#endif #endif
#if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1 && !defined(CONFIG_SPI_X) #if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1
uchar addr[2]; uchar addr[2];
blk_off = offset & 0xFF; /* block offset */ 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[1] = offset >> 8; /* upper address octet */
addr[2] = blk_off; /* lower address octet */ addr[2] = blk_off; /* lower address octet */
alen = 3; 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 */ 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; unsigned maxlen;
#endif #endif
#if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1 && !defined(CONFIG_SPI_X) #if CONFIG_SYS_I2C_EEPROM_ADDR_LEN == 1
uchar addr[2]; uchar addr[2];
blk_off = offset & 0xFF; /* block offset */ 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[1] = offset >> 8; /* upper address octet */
addr[2] = blk_off; /* lower address octet */ addr[2] = blk_off; /* lower address octet */
alen = 3; 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 */ addr[0] |= dev_addr; /* insert device address */