random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

davinci: Drop CONFIG_MAC_ADDR_IN_EEPROM

Browse Source 
Looking over the current boards, there are no users of
CONFIG_MAC_ADDR_IN_EEPROM.  Further, omapl138_lcdk uses
CONFIG_NET_RANDOM_ETHADDR.  Drop various unused code paths.

Cc: Adam Ford <aford173@gmail.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2021-08-17 17:59:37 -04:00
parent 2a1453695d
commit 20815ecdcf
5 changed files with 3 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-davinci/include/mach/davinci_misc.h
View File

@ -35,7 +35,6 @@ struct lpsc_resource {
const int lpsc_no; const int lpsc_no;
}; };
int dvevm_read_mac_address(uint8_t *buf);
void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr); void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr);
int davinci_configure_pin_mux(const struct pinmux_config *pins, int n_pins); int davinci_configure_pin_mux(const struct pinmux_config *pins, int n_pins);
int davinci_configure_pin_mux_items(const struct pinmux_resource *item, int davinci_configure_pin_mux_items(const struct pinmux_resource *item,

27
arch/arm/mach-davinci/misc.c
View File

@ -41,33 +41,6 @@ int dram_init_banksize(void)
#endif #endif
#ifdef CONFIG_DRIVER_TI_EMAC #ifdef CONFIG_DRIVER_TI_EMAC
/*
* Read ethernet MAC address from EEPROM for DVEVM compatible boards.
* Returns 1 if found, 0 otherwise.
*/
int dvevm_read_mac_address(uint8_t *buf)
{
#ifdef CONFIG_SYS_I2C_EEPROM_ADDR
/* Read MAC address. */
if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0x7F00,
CONFIG_SYS_I2C_EEPROM_ADDR_LEN, (uint8_t *) &buf[0], 6))
goto i2cerr;
/* Check that MAC address is valid. */
if (!is_valid_ethaddr(buf))
goto err;
return 1; /* Found */
i2cerr:
printf("Read from EEPROM @ 0x%02x failed\n",
CONFIG_SYS_I2C_EEPROM_ADDR);
err:
#endif /* CONFIG_SYS_I2C_EEPROM_ADDR */
return 0;
}
/* /*
* Set the mii mode as MII or RMII * Set the mii mode as MII or RMII
*/ */

9
board/davinci/da8xxevm/Kconfig
View File

@ -22,15 +22,6 @@ config MAC_ADDR_IN_SPIFLASH
their MAC address in SPI Flash from the factory their MAC address in SPI Flash from the factory
Enable this option to read the MAC from SPI Flash Enable this option to read the MAC from SPI Flash
config MAC_ADDR_IN_EEPROM
bool "MAC address in EEPROM"
help
The DA850 EVM comes with SoM are programmed with
their MAC address in SPI Flash from the factory,
but the kit has an optional expansion board with
EEPROM available. Enable this option to read the
MAC from the EEPROM
endif endif
endif endif

41
board/davinci/da8xxevm/da850evm.c
View File

@ -129,19 +129,12 @@ int misc_init_r(void)
{ {
dspwake(); dspwake();
#if defined(CONFIG_MAC_ADDR_IN_SPIFLASH) || defined(CONFIG_MAC_ADDR_IN_EEPROM) #if defined(CONFIG_MAC_ADDR_IN_SPIFLASH)
uchar env_enetaddr[6], buff[6];
uchar env_enetaddr[6]; int enetaddr_found, spi_mac_read;
int enetaddr_found;
enetaddr_found = eth_env_get_enetaddr("ethaddr", env_enetaddr); enetaddr_found = eth_env_get_enetaddr("ethaddr", env_enetaddr);
#endif
#ifdef CONFIG_MAC_ADDR_IN_SPIFLASH
int spi_mac_read;
uchar buff[6];
spi_mac_read = get_mac_addr(buff); spi_mac_read = get_mac_addr(buff);
buff[0] = 0; buff[0] = 0;
@ -173,34 +166,6 @@ int misc_init_r(void)
"with the MAC address in the environment\n"); "with the MAC address in the environment\n");
printf("Default using MAC address from environment\n"); printf("Default using MAC address from environment\n");
} }
#elif defined(CONFIG_MAC_ADDR_IN_EEPROM)
uint8_t enetaddr[8];
int eeprom_mac_read;
/* Read Ethernet MAC address from EEPROM */
eeprom_mac_read = dvevm_read_mac_address(enetaddr);
/*
* MAC address not present in the environment
* try and read the MAC address from EEPROM flash
* and set it.
*/
if (!enetaddr_found) {
if (eeprom_mac_read)
/* Set Ethernet MAC address from EEPROM */
davinci_sync_env_enetaddr(enetaddr);
} else {
/*
* MAC address present in environment compare it with
* the MAC address in EEPROM and warn on mismatch
*/
if (eeprom_mac_read && memcmp(enetaddr, env_enetaddr, 6))
printf("Warning: MAC address in EEPROM don't match "
"with the MAC address in the environment\n");
printf("Default using MAC address from environment\n");
}
#endif #endif
return 0; return 0;
} }

29
board/davinci/da8xxevm/omapl138_lcdk.c
View File

@ -236,12 +236,6 @@ int board_init(void)
#define CFG_MAC_ADDR_OFFSET (flash->size - SZ_64K) #define CFG_MAC_ADDR_OFFSET (flash->size - SZ_64K)
static int get_mac_addr(u8 *addr)
{
/* Need to find a way to get MAC ADDRESS */
return 0;
}
void dsp_lpsc_on(unsigned domain, unsigned int id) void dsp_lpsc_on(unsigned domain, unsigned int id)
{ {
dv_reg_p mdstat, mdctl, ptstat, ptcmd; dv_reg_p mdstat, mdctl, ptstat, ptcmd;
@ -304,29 +298,6 @@ int rmii_hw_init(void)
int misc_init_r(void) int misc_init_r(void)
{ {
uint8_t tmp[20], addr[10];
if (env_get("ethaddr") == NULL) {
/* Read Ethernet MAC address from EEPROM */
if (dvevm_read_mac_address(addr)) {
/* Set Ethernet MAC address from EEPROM */
davinci_sync_env_enetaddr(addr);
} else {
get_mac_addr(addr);
}
if (!is_multicast_ethaddr(addr) && !is_zero_ethaddr(addr)) {
sprintf((char *)tmp, "%02x:%02x:%02x:%02x:%02x:%02x",
addr[0], addr[1], addr[2], addr[3], addr[4],
addr[5]);
env_set("ethaddr", (char *)tmp);
} else {
printf("Invalid MAC address read.\n");
}
}
#ifdef CONFIG_DRIVER_TI_EMAC_USE_RMII #ifdef CONFIG_DRIVER_TI_EMAC_USE_RMII
/* Select RMII fucntion through the expander */ /* Select RMII fucntion through the expander */
if (rmii_hw_init()) if (rmii_hw_init())