From mboxrd@z Thu Jan 1 00:00:00 1970 From: Heiko Schocher Date: Mon, 16 Nov 2015 12:27:31 +0100 Subject: [U-Boot] [PATCH 06/17] eeprom: Zap CONFIG_SPI_X In-Reply-To: <1447185213-5799-6-git-send-email-marex@denx.de> References: <1447185213-5799-1-git-send-email-marex@denx.de> <1447185213-5799-6-git-send-email-marex@denx.de> Message-ID: <5649BDA3.4000609@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hello Marek, Am 10.11.2015 um 20:53 schrieb Marek Vasut: > This macro is no longer used, so just reap it. > > Signed-off-by: Marek Vasut > Cc: Tom Rini > Cc: Simon Glass > Cc: Heiko Schocher > --- > README | 5 ----- > common/cmd_eeprom.c | 8 ++++---- > 2 files changed, 4 insertions(+), 9 deletions(-) Reviewed-by: Heiko Schocher bye, Heiko > > diff --git a/README b/README > index ef8d437..8fb81e9 100644 > --- a/README > +++ b/README > @@ -2705,11 +2705,6 @@ CBFS (Coreboot Filesystem) support > Enables the driver for SPI controller on SuperH. Currently > only SH7757 is supported. > > - CONFIG_SPI_X > - > - Enables extended (16-bit) SPI EEPROM addressing. > - (symmetrical to CONFIG_I2C_X) > - > CONFIG_SOFT_SPI > > Enables a software (bit-bang) SPI driver rather than > 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 */ > > -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany