dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-03 17:52:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

spi: Remove unused mpc8xx code

Browse Source 
- 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 <jagan@amarulasolutions.com>
This commit is contained in:
Jagan Teki
2018-11-22 21:38:38 +05:30
parent f34d0315e9
commit efbeabee79
3 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/eeprom.c
View File

@@ -66,11 +66,6 @@ __weak int eeprom_write_enable(unsigned dev_addr, int state)
void eeprom_init(int bus) 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 */ /* I2C EEPROM */
#if defined(CONFIG_SYS_I2C) #if defined(CONFIG_SYS_I2C)
if (bus >= 0) if (bus >= 0)
@@ -129,14 +124,6 @@ static int eeprom_rw_block(unsigned offset, uchar *addr, unsigned alen,
{ {
int ret = 0; 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) #if defined(CONFIG_SYS_I2C_EEPROM_BUS)
i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS); i2c_set_bus_num(CONFIG_SYS_I2C_EEPROM_BUS);
#endif #endif
@@ -148,7 +135,7 @@ static int eeprom_rw_block(unsigned offset, uchar *addr, unsigned alen,
if (ret) if (ret)
ret = 1; ret = 1;
#endif
return ret; return ret;
} }

7
common/board_r.c
View File

@@ -382,13 +382,6 @@ static int initr_flash(void)
#if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI) #if defined(CONFIG_PPC) && !defined(CONFIG_DM_SPI)
static int initr_spi(void) 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; return 0;
} }
#endif #endif

7
include/common.h
View File

@@ -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 # define CONFIG_SYS_DEF_EEPROM_ADDR CONFIG_SYS_I2C_EEPROM_ADDR
#endif #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 */ /* $(BOARD)/$(BOARD).c */
int board_early_init_f (void); int board_early_init_f (void);
int board_fix_fdt (void *rw_fdt_blob); /* manipulate the U-Boot fdt before its relocation */ int board_fix_fdt (void *rw_fdt_blob); /* manipulate the U-Boot fdt before its relocation */