- spi_init_f
- spi_init_r
- spi_read
- spi_write
these spi calls are exclusively for mpc8xx, but
the relevant driver is not available so remove it.
Signed-off-by: Jagan Teki <ja...@amarulasolutions.com>
---
cmd/eeprom.c | 15 +--------------
common/board_r.c | 7 -------
include/common.h | 7 -------
3 files changed, 1 insertion(+), 28 deletions(-)
diff --git a/cmd/eeprom.c b/cmd/eeprom.c
index 4052cf494a..9136630ada 100644
--- a/cmd/eeprom.c
+++ b/cmd/eeprom.c
@@ -66,11 +66,6 @@ __weak int eeprom_write_enable(unsigned dev_addr, int state)
void eeprom_init(int bus)
{
- /* SPI EEPROM */
-#if defined(CONFIG_MPC8XX_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
- spi_init_f();
-#endif
-
/* I2C EEPROM */
#if defined(CONFIG_SYS_I2C)
if (bus >= 0)
@@ -129,14 +124,6 @@ static int eeprom_rw_block(unsigned offset, uchar *addr,
unsigned alen,
{
int ret = 0;
- /* SPI */
-#if defined(CONFIG_MPC8XX_SPI) && !defined(CONFIG_ENV_EEPROM_IS_ON_I2C)
- if (read)
- spi_read(addr, alen, buffer, len);
- else
- spi_write(addr, alen, buffer, len);
-#else /* I2C */
-
#if defined(CONFIG_SYS_I2C_EEPROM_BUS)
i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS);
#endif
@@ -148,7 +135,7 @@ static int eeprom_rw_block(unsigned offset, uchar *addr,
unsigned alen,
if (ret)
ret = 1;
-#endif
+
return ret;
}
diff --git a/common/board_r.c b/common/board_r.c
index c55e33eec2..3ccef5467b 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -382,13 +382,6 @@ static int initr_flash(void)
#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI)
static int initr_spi(void)
{
- /* MPC8xx does this here */
-#ifdef CONFIG_MPC8XX_SPI
-#if !defined(CONFIG_ENV_IS_IN_EEPROM)
- spi_init_f();
-#endif
- spi_init_r();
-#endif
return 0;
}
#endif
diff --git a/include/common.h b/include/common.h
index 3f69943887..cfbdf7ebcb 100644
--- a/include/common.h
+++ b/include/common.h
@@ -276,13 +276,6 @@ int eeprom_write (unsigned dev_addr, unsigned offset,
uchar *buffer, unsigned c
# define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
#endif
-#if defined(CONFIG_MPC8XX_SPI)
-extern void spi_init_f (void);
-extern void spi_init_r (void);
-extern ssize_t spi_read (uchar *, int, uchar *, int);
-extern ssize_t spi_write (uchar *, int, uchar *, int);
-#endif
-
/* $(BOARD)/$(BOARD).c */
int board_early_init_f (void);
int board_fix_fdt (void *rw_fdt_blob); /* manipulate the U-Boot fdt before its
relocation */
--
2.18.0.321.gffc6fa0e3
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
