mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 15:14:43 +00:00
env: Rename eth_getenv_enetaddr() to eth_env_get_enetaddr()
Rename this function for consistency with env_get(). Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
bfebc8c965
commit
35affd7a2f
47 changed files with 68 additions and 69 deletions
|
@ -90,7 +90,7 @@ void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr)
|
|||
uint8_t env_enetaddr[6];
|
||||
int ret;
|
||||
|
||||
ret = eth_getenv_enetaddr_by_index("eth", 0, env_enetaddr);
|
||||
ret = eth_env_get_enetaddr_by_index("eth", 0, env_enetaddr);
|
||||
if (!ret) {
|
||||
/*
|
||||
* There is no MAC address in the environment, so we
|
||||
|
|
|
@ -580,7 +580,7 @@ static void fdt_fixup_l2_switch(void *blob)
|
|||
return;
|
||||
|
||||
/* Get MAC address for the l2switch from "l2switchaddr"*/
|
||||
if (!eth_getenv_enetaddr("l2switchaddr", l2swaddr)) {
|
||||
if (!eth_env_get_enetaddr("l2switchaddr", l2swaddr)) {
|
||||
printf("Warning: MAC address for l2switch not found\n");
|
||||
memset(l2swaddr, 0, sizeof(l2swaddr));
|
||||
}
|
||||
|
|
|
@ -44,7 +44,7 @@ int misc_init_r(void)
|
|||
mdelay(10);
|
||||
setbits_le32(GXBB_GPIO_OUT(3), BIT(14));
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", mac_addr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
|
||||
len = meson_sm_read_efuse(EFUSE_MAC_OFFSET,
|
||||
mac_addr, EFUSE_MAC_SIZE);
|
||||
if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr))
|
||||
|
|
|
@ -203,7 +203,7 @@ void check_enetaddr(void)
|
|||
{
|
||||
uchar enetaddr[6];
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr)) {
|
||||
/* signal unset/invalid ethaddr to user */
|
||||
set_led(LED_INFO_BLINKING);
|
||||
}
|
||||
|
|
|
@ -95,7 +95,7 @@ static int cl_som_am57x_handle_mac_address(char *env_name, uint port_num)
|
|||
int ret;
|
||||
uint8_t enetaddr[6];
|
||||
|
||||
ret = eth_getenv_enetaddr(env_name, enetaddr);
|
||||
ret = eth_env_get_enetaddr(env_name, enetaddr);
|
||||
if (ret)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -470,7 +470,7 @@ static int handle_mac_address(char *env_var, uint eeprom_bus)
|
|||
unsigned char enetaddr[6];
|
||||
int rc;
|
||||
|
||||
rc = eth_getenv_enetaddr(env_var, enetaddr);
|
||||
rc = eth_env_get_enetaddr(env_var, enetaddr);
|
||||
if (rc)
|
||||
return 0;
|
||||
|
||||
|
@ -605,13 +605,13 @@ int ft_board_setup(void *blob, bd_t *bd)
|
|||
fdt_shrink_to_minimum(blob, 0); /* Make room for new properties */
|
||||
|
||||
/* MAC addr */
|
||||
if (eth_getenv_enetaddr("ethaddr", enetaddr)) {
|
||||
if (eth_env_get_enetaddr("ethaddr", enetaddr)) {
|
||||
fdt_find_and_setprop(blob,
|
||||
"/soc/aips-bus@02100000/ethernet@02188000",
|
||||
"local-mac-address", enetaddr, 6, 1);
|
||||
}
|
||||
|
||||
if (eth_getenv_enetaddr("eth1addr", enetaddr)) {
|
||||
if (eth_env_get_enetaddr("eth1addr", enetaddr)) {
|
||||
fdt_find_and_setprop(blob, "/eth@pcie", "local-mac-address",
|
||||
enetaddr, 6, 1);
|
||||
}
|
||||
|
|
|
@ -106,7 +106,7 @@ static int handle_mac_address(void)
|
|||
uchar enetaddr[6];
|
||||
int rv;
|
||||
|
||||
rv = eth_getenv_enetaddr("ethaddr", enetaddr);
|
||||
rv = eth_env_get_enetaddr("ethaddr", enetaddr);
|
||||
if (rv)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -434,7 +434,7 @@ static int handle_mac_address(void)
|
|||
unsigned char enetaddr[6];
|
||||
int rc;
|
||||
|
||||
rc = eth_getenv_enetaddr("ethaddr", enetaddr);
|
||||
rc = eth_env_get_enetaddr("ethaddr", enetaddr);
|
||||
if (rc)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -168,7 +168,7 @@ static int cm_t3517_handle_mac_address(void)
|
|||
unsigned char enetaddr[6];
|
||||
int ret;
|
||||
|
||||
ret = eth_getenv_enetaddr("ethaddr", enetaddr);
|
||||
ret = eth_env_get_enetaddr("ethaddr", enetaddr);
|
||||
if (ret)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -126,7 +126,7 @@ int ft_board_setup(void *blob, bd_t *bd)
|
|||
uint8_t enetaddr[6];
|
||||
|
||||
/* MAC addr */
|
||||
if (eth_getenv_enetaddr("usbethaddr", enetaddr)) {
|
||||
if (eth_env_get_enetaddr("usbethaddr", enetaddr)) {
|
||||
fdt_find_and_setprop(blob, "/smsc95xx@0", "mac-address",
|
||||
enetaddr, 6, 1);
|
||||
}
|
||||
|
@ -161,7 +161,7 @@ static int handle_mac_address(void)
|
|||
uint8_t enetaddr[6];
|
||||
int ret;
|
||||
|
||||
ret = eth_getenv_enetaddr("usbethaddr", enetaddr);
|
||||
ret = eth_env_get_enetaddr("usbethaddr", enetaddr);
|
||||
if (ret)
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -131,7 +131,7 @@ int misc_init_r(void)
|
|||
uchar env_enetaddr[6];
|
||||
int enetaddr_found;
|
||||
|
||||
enetaddr_found = eth_getenv_enetaddr("ethaddr", env_enetaddr);
|
||||
enetaddr_found = eth_env_get_enetaddr("ethaddr", env_enetaddr);
|
||||
|
||||
#ifdef CONFIG_MAC_ADDR_IN_SPIFLASH
|
||||
int spi_mac_read;
|
||||
|
|
|
@ -239,7 +239,7 @@ int board_eth_init(bd_t *bis)
|
|||
uint32_t mac_hi, mac_lo;
|
||||
const char *devname;
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", mac_addr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
|
||||
/* try reading mac address from efuse */
|
||||
mac_lo = readl(&cdev->macid0l);
|
||||
mac_hi = readl(&cdev->macid0h);
|
||||
|
|
|
@ -264,7 +264,7 @@ int board_eth_init(bd_t *bis)
|
|||
uint8_t mac_addr[6];
|
||||
uint32_t mac_hi, mac_lo;
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", mac_addr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
|
||||
/* try reading mac address from efuse */
|
||||
mac_lo = readl(&cdev->macid0l);
|
||||
mac_hi = readl(&cdev->macid0h);
|
||||
|
|
|
@ -130,7 +130,7 @@ int board_eth_init(bd_t *bis)
|
|||
uchar eth_addr[6];
|
||||
|
||||
rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
|
||||
if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
|
||||
if (!eth_env_get_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
|
||||
dev = eth_get_dev_by_index(0);
|
||||
if (dev) {
|
||||
eth_env_set_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
|
||||
|
|
|
@ -216,7 +216,7 @@ int board_eth_init(bd_t *bis)
|
|||
uint8_t mac_addr[6];
|
||||
uint32_t mac_hi, mac_lo;
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", mac_addr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
|
||||
printf("<ethaddr> not set. Reading from E-fuse\n");
|
||||
/* try reading mac address from efuse */
|
||||
mac_lo = readl(&cdev->macid0l);
|
||||
|
|
|
@ -143,7 +143,7 @@ int board_eth_init(bd_t *bis)
|
|||
unsigned char enetaddr[6];
|
||||
|
||||
ret = sh_eth_initialize(bis);
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr))
|
||||
return ret;
|
||||
|
||||
/* Set Mac address */
|
||||
|
|
|
@ -418,7 +418,7 @@ int board_eth_init(bd_t *bis)
|
|||
|
||||
rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
|
||||
|
||||
if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
|
||||
if (!eth_env_get_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
|
||||
dev = eth_get_dev_by_index(0);
|
||||
if (dev) {
|
||||
eth_env_set_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
|
||||
|
|
|
@ -126,7 +126,7 @@ int board_eth_init(bd_t *bis)
|
|||
|
||||
#ifdef CONFIG_SH_ETHER
|
||||
ret = sh_eth_initialize(bis);
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr))
|
||||
return ret;
|
||||
|
||||
/* Set Mac address */
|
||||
|
|
|
@ -131,7 +131,7 @@ int board_eth_init(bd_t *bis)
|
|||
unsigned char enetaddr[6];
|
||||
|
||||
ret = sh_eth_initialize(bis);
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr))
|
||||
return ret;
|
||||
|
||||
/* Set Mac address */
|
||||
|
|
|
@ -136,7 +136,7 @@ int board_eth_init(bd_t *bis)
|
|||
unsigned char enetaddr[6];
|
||||
|
||||
ret = sh_eth_initialize(bis);
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr))
|
||||
return ret;
|
||||
|
||||
/* Set Mac address */
|
||||
|
|
|
@ -126,7 +126,7 @@ int board_eth_init(bd_t *bis)
|
|||
unsigned char enetaddr[6];
|
||||
|
||||
ret = sh_eth_initialize(bis);
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr))
|
||||
return ret;
|
||||
|
||||
/* Set Mac address */
|
||||
|
|
|
@ -135,7 +135,7 @@ int board_eth_init(bd_t *bis)
|
|||
unsigned char enetaddr[6];
|
||||
|
||||
ret = sh_eth_initialize(bis);
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr))
|
||||
return ret;
|
||||
|
||||
/* Set Mac address */
|
||||
|
|
|
@ -137,7 +137,7 @@ int board_eth_init(bd_t *bis)
|
|||
unsigned char enetaddr[6];
|
||||
|
||||
ret = sh_eth_initialize(bis);
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr))
|
||||
return ret;
|
||||
|
||||
/* Set Mac address */
|
||||
|
|
|
@ -171,7 +171,7 @@ int board_eth_init(bd_t *bis)
|
|||
uint8_t mac_addr[6];
|
||||
uint32_t mac_hi, mac_lo;
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", mac_addr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
|
||||
printf("<ethaddr> not set. Reading from E-fuse\n");
|
||||
/* try reading mac address from efuse */
|
||||
mac_lo = readl(&cdev->macid0l);
|
||||
|
|
|
@ -53,7 +53,7 @@ int misc_init_r(void)
|
|||
#if defined(CONFIG_CMD_NET)
|
||||
uchar mac_id[6];
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", mac_id) && !i2c_read_mac(mac_id))
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_id) && !i2c_read_mac(mac_id))
|
||||
eth_env_set_enetaddr("ethaddr", mac_id);
|
||||
#endif
|
||||
env_set("verify", "n");
|
||||
|
|
|
@ -297,7 +297,7 @@ int board_eth_init(bd_t *bis)
|
|||
|
||||
rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
|
||||
|
||||
if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
|
||||
if (!eth_env_get_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
|
||||
dev = eth_get_dev_by_index(0);
|
||||
if (dev) {
|
||||
eth_env_set_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
|
||||
|
|
|
@ -166,7 +166,7 @@ int board_eth_init(bd_t *bis)
|
|||
uint8_t mac_addr[6];
|
||||
uint32_t mac_hi, mac_lo;
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", mac_addr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
|
||||
printf("<ethaddr> not set. Reading from E-fuse\n");
|
||||
/* try reading mac address from efuse */
|
||||
mac_lo = readl(&cdev->macid0l);
|
||||
|
|
|
@ -38,7 +38,7 @@ int board_eth_init(bd_t *bis)
|
|||
uint32_t mac_hi, mac_lo;
|
||||
struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", mac_addr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", mac_addr)) {
|
||||
printf("<ethaddr> not set. Reading from E-fuse\n");
|
||||
/* try reading mac address from efuse */
|
||||
mac_lo = readl(&cdev->macid0l);
|
||||
|
|
|
@ -102,7 +102,7 @@ int misc_init_r(void)
|
|||
CONFIG_DM9000_BASE, GPMC_SIZE_16M);
|
||||
|
||||
/* Use OMAP DIE_ID as MAC address */
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr)) {
|
||||
printf("ethaddr not set, using Die ID\n");
|
||||
die_id_0 = readl(&id_base->die_id_0);
|
||||
enetaddr[0] = 0x02; /* locally administered */
|
||||
|
|
|
@ -86,11 +86,11 @@ int show_board_info(void)
|
|||
* Check if environment contains a valid MAC address,
|
||||
* set the one from config block if not
|
||||
*/
|
||||
if (!eth_getenv_enetaddr("ethaddr", ethaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", ethaddr))
|
||||
eth_env_set_enetaddr("ethaddr", (u8 *)&tdx_eth_addr);
|
||||
|
||||
#ifdef CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR
|
||||
if (!eth_getenv_enetaddr("eth1addr", ethaddr)) {
|
||||
if (!eth_env_get_enetaddr("eth1addr", ethaddr)) {
|
||||
/*
|
||||
* Secondary MAC address is allocated from block
|
||||
* 0x100000 higher then the first MAC address
|
||||
|
|
|
@ -242,11 +242,11 @@ int do_bootvx(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
|
|||
*/
|
||||
#if defined(CONFIG_WALNUT)
|
||||
tmp = (char *)CONFIG_SYS_NVRAM_BASE_ADDR + 0x500;
|
||||
eth_getenv_enetaddr("ethaddr", (uchar *)build_buf);
|
||||
eth_env_get_enetaddr("ethaddr", (uchar *)build_buf);
|
||||
memcpy(tmp, &build_buf[3], 3);
|
||||
#elif defined(CONFIG_SYS_VXWORKS_MAC_PTR)
|
||||
tmp = (char *)CONFIG_SYS_VXWORKS_MAC_PTR;
|
||||
eth_getenv_enetaddr("ethaddr", (uchar *)build_buf);
|
||||
eth_env_get_enetaddr("ethaddr", (uchar *)build_buf);
|
||||
memcpy(tmp, build_buf, 6);
|
||||
#else
|
||||
puts("## Ethernet MAC address not copied to NV RAM\n");
|
||||
|
|
|
@ -70,8 +70,7 @@ static int format_mac_pxe(char *outbuf, size_t outbuf_len)
|
|||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (!eth_getenv_enetaddr_by_index("eth", eth_get_dev_index(),
|
||||
ethaddr))
|
||||
if (!eth_env_get_enetaddr_by_index("eth", eth_get_dev_index(), ethaddr))
|
||||
return -ENOENT;
|
||||
|
||||
sprintf(outbuf, "01-%02x-%02x-%02x-%02x-%02x-%02x",
|
||||
|
|
|
@ -537,21 +537,21 @@ static int initr_ethaddr(void)
|
|||
bd_t *bd = gd->bd;
|
||||
|
||||
/* kept around for legacy kernels only ... ignore the next section */
|
||||
eth_getenv_enetaddr("ethaddr", bd->bi_enetaddr);
|
||||
eth_env_get_enetaddr("ethaddr", bd->bi_enetaddr);
|
||||
#ifdef CONFIG_HAS_ETH1
|
||||
eth_getenv_enetaddr("eth1addr", bd->bi_enet1addr);
|
||||
eth_env_get_enetaddr("eth1addr", bd->bi_enet1addr);
|
||||
#endif
|
||||
#ifdef CONFIG_HAS_ETH2
|
||||
eth_getenv_enetaddr("eth2addr", bd->bi_enet2addr);
|
||||
eth_env_get_enetaddr("eth2addr", bd->bi_enet2addr);
|
||||
#endif
|
||||
#ifdef CONFIG_HAS_ETH3
|
||||
eth_getenv_enetaddr("eth3addr", bd->bi_enet3addr);
|
||||
eth_env_get_enetaddr("eth3addr", bd->bi_enet3addr);
|
||||
#endif
|
||||
#ifdef CONFIG_HAS_ETH4
|
||||
eth_getenv_enetaddr("eth4addr", bd->bi_enet4addr);
|
||||
eth_env_get_enetaddr("eth4addr", bd->bi_enet4addr);
|
||||
#endif
|
||||
#ifdef CONFIG_HAS_ETH5
|
||||
eth_getenv_enetaddr("eth5addr", bd->bi_enet5addr);
|
||||
eth_env_get_enetaddr("eth5addr", bd->bi_enet5addr);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -84,7 +84,7 @@ uchar enetaddr[6];
|
|||
eth_parse_enetaddr(addr, enetaddr);
|
||||
/* enetaddr now equals { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 } */
|
||||
|
||||
* int eth_getenv_enetaddr(char *name, uchar *enetaddr);
|
||||
* int eth_env_get_enetaddr(char *name, uchar *enetaddr);
|
||||
|
||||
Look up an environment variable and convert the stored address. If the address
|
||||
is valid, then the function returns 1. Otherwise, the function returns 0. In
|
||||
|
@ -92,7 +92,7 @@ all cases, the enetaddr memory is initialized. If the env var is not found,
|
|||
then it is set to all zeros. The common function is_valid_ethaddr() is used
|
||||
to determine address validity.
|
||||
uchar enetaddr[6];
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr)) {
|
||||
/* "ethaddr" is not set in the environment */
|
||||
... try and setup "ethaddr" in the env ...
|
||||
}
|
||||
|
|
|
@ -750,7 +750,7 @@ static void update_srom(struct eth_device *dev, bd_t *bis)
|
|||
uchar enetaddr[6];
|
||||
|
||||
/* Ethernet Addr... */
|
||||
if (!eth_getenv_enetaddr("ethaddr", enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", enetaddr))
|
||||
return;
|
||||
eeprom[0x0a] = (enetaddr[1] << 8) | enetaddr[0];
|
||||
eeprom[0x0b] = (enetaddr[3] << 8) | enetaddr[2];
|
||||
|
|
|
@ -190,8 +190,8 @@ static int mc_fixup_mac_addr(void *blob, int nodeoffset,
|
|||
/* MAC address property present */
|
||||
if (fdt_get_property(blob, nodeoffset, propname, NULL)) {
|
||||
/* u-boot MAC addr randomly assigned - leave the present one */
|
||||
if (!eth_getenv_enetaddr_by_index("eth", eth_dev->index,
|
||||
env_enetaddr))
|
||||
if (!eth_env_get_enetaddr_by_index("eth", eth_dev->index,
|
||||
env_enetaddr))
|
||||
return err;
|
||||
} else {
|
||||
size = MC_DT_INCREASE_SIZE + strlen(propname) + len;
|
||||
|
|
|
@ -383,9 +383,9 @@ static int fec_init(struct eth_device *dev, bd_t * bd)
|
|||
|
||||
/* Set station address */
|
||||
if ((u32) fecp == CONFIG_SYS_FEC0_IOBASE)
|
||||
eth_getenv_enetaddr("ethaddr", enetaddr);
|
||||
eth_env_get_enetaddr("ethaddr", enetaddr);
|
||||
else
|
||||
eth_getenv_enetaddr("eth1addr", enetaddr);
|
||||
eth_env_get_enetaddr("eth1addr", enetaddr);
|
||||
fec_set_hwaddr(fecp, enetaddr);
|
||||
|
||||
/* Set Opcode/Pause Duration Register */
|
||||
|
|
|
@ -346,7 +346,7 @@ static void ftgmac100_set_mac(struct eth_device *dev,
|
|||
|
||||
static void ftgmac100_set_mac_from_env(struct eth_device *dev)
|
||||
{
|
||||
eth_getenv_enetaddr("ethaddr", dev->enetaddr);
|
||||
eth_env_get_enetaddr("ethaddr", dev->enetaddr);
|
||||
|
||||
ftgmac100_set_mac(dev, dev->enetaddr);
|
||||
}
|
||||
|
|
|
@ -355,7 +355,7 @@ static int ftmac100_free_pkt(struct udevice *dev, uchar *packet, int length)
|
|||
int ftmac100_read_rom_hwaddr(struct udevice *dev)
|
||||
{
|
||||
struct eth_pdata *pdata = dev_get_platdata(dev);
|
||||
eth_getenv_enetaddr("ethaddr", pdata->enetaddr);
|
||||
eth_env_get_enetaddr("ethaddr", pdata->enetaddr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -704,7 +704,7 @@ static int smc_get_ethaddr(bd_t *bd, struct eth_device *dev)
|
|||
{
|
||||
uchar v_mac[6];
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", v_mac)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", v_mac)) {
|
||||
/* get ROM mac value if any */
|
||||
if (!get_rom_mac(dev, v_mac)) {
|
||||
printf("\n*** ERROR: ethaddr is NOT set !!\n");
|
||||
|
|
|
@ -428,25 +428,25 @@ int fec_init(struct eth_device *dev, bd_t * bd)
|
|||
if ((u32) fecp == CONFIG_SYS_FEC0_IOBASE) {
|
||||
#ifdef CONFIG_SYS_FEC1_IOBASE
|
||||
volatile fec_t *fecp1 = (fec_t *) (CONFIG_SYS_FEC1_IOBASE);
|
||||
eth_getenv_enetaddr("eth1addr", ea);
|
||||
eth_env_get_enetaddr("eth1addr", ea);
|
||||
fecp1->palr =
|
||||
(ea[0] << 24) | (ea[1] << 16) | (ea[2] << 8) | (ea[3]);
|
||||
fecp1->paur = (ea[4] << 24) | (ea[5] << 16);
|
||||
#endif
|
||||
eth_getenv_enetaddr("ethaddr", ea);
|
||||
eth_env_get_enetaddr("ethaddr", ea);
|
||||
fecp->palr =
|
||||
(ea[0] << 24) | (ea[1] << 16) | (ea[2] << 8) | (ea[3]);
|
||||
fecp->paur = (ea[4] << 24) | (ea[5] << 16);
|
||||
} else {
|
||||
#ifdef CONFIG_SYS_FEC0_IOBASE
|
||||
volatile fec_t *fecp0 = (fec_t *) (CONFIG_SYS_FEC0_IOBASE);
|
||||
eth_getenv_enetaddr("ethaddr", ea);
|
||||
eth_env_get_enetaddr("ethaddr", ea);
|
||||
fecp0->palr =
|
||||
(ea[0] << 24) | (ea[1] << 16) | (ea[2] << 8) | (ea[3]);
|
||||
fecp0->paur = (ea[4] << 24) | (ea[5] << 16);
|
||||
#endif
|
||||
#ifdef CONFIG_SYS_FEC1_IOBASE
|
||||
eth_getenv_enetaddr("eth1addr", ea);
|
||||
eth_env_get_enetaddr("eth1addr", ea);
|
||||
fecp->palr =
|
||||
(ea[0] << 24) | (ea[1] << 16) | (ea[2] << 8) | (ea[3]);
|
||||
fecp->paur = (ea[4] << 24) | (ea[5] << 16);
|
||||
|
|
|
@ -715,12 +715,12 @@ static int ne2k_setup_driver(struct eth_device *dev)
|
|||
* to the MAC address value in the environment, so we do not read
|
||||
* it from the prom or eeprom if it is specified in the environment.
|
||||
*/
|
||||
if (!eth_getenv_enetaddr("ethaddr", dev->enetaddr)) {
|
||||
if (!eth_env_get_enetaddr("ethaddr", dev->enetaddr)) {
|
||||
/* If the MAC address is not in the environment, get it: */
|
||||
if (!get_prom(dev->enetaddr, nic.base)) /* get MAC from prom */
|
||||
dp83902a_init(dev->enetaddr); /* fallback: seeprom */
|
||||
/* And write it into the environment otherwise eth_write_hwaddr
|
||||
* returns -1 due to eth_getenv_enetaddr_by_index() failing,
|
||||
* returns -1 due to eth_env_get_enetaddr_by_index() failing,
|
||||
* and this causes "Warning: failed to set MAC address", and
|
||||
* cmd_bdinfo has no ethaddr value which it can show: */
|
||||
eth_env_set_enetaddr("ethaddr", dev->enetaddr);
|
||||
|
|
|
@ -578,7 +578,7 @@ int sh_eth_initialize(bd_t *bd)
|
|||
if (retval < 0)
|
||||
return retval;
|
||||
|
||||
if (!eth_getenv_enetaddr("ethaddr", dev->enetaddr))
|
||||
if (!eth_env_get_enetaddr("ethaddr", dev->enetaddr))
|
||||
puts("Please set MAC address\n");
|
||||
|
||||
return ret;
|
||||
|
|
|
@ -239,7 +239,7 @@ void eth_set_current(void); /* set nterface to ethcur var */
|
|||
|
||||
int eth_get_dev_index(void); /* get the device index */
|
||||
void eth_parse_enetaddr(const char *addr, uchar *enetaddr);
|
||||
int eth_getenv_enetaddr(const char *name, uchar *enetaddr);
|
||||
int eth_env_get_enetaddr(const char *name, uchar *enetaddr);
|
||||
int eth_env_set_enetaddr(const char *name, const uchar *enetaddr);
|
||||
|
||||
/**
|
||||
|
@ -275,7 +275,7 @@ int usb_ether_init(void);
|
|||
* Returns:
|
||||
* Return true if the address is valid.
|
||||
*/
|
||||
int eth_getenv_enetaddr_by_index(const char *base_name, int index,
|
||||
int eth_env_get_enetaddr_by_index(const char *base_name, int index,
|
||||
uchar *enetaddr);
|
||||
|
||||
int eth_init(void); /* Initialize the device */
|
||||
|
|
|
@ -495,7 +495,7 @@ static int eth_post_probe(struct udevice *dev)
|
|||
if (eth_get_ops(dev)->read_rom_hwaddr)
|
||||
eth_get_ops(dev)->read_rom_hwaddr(dev);
|
||||
|
||||
eth_getenv_enetaddr_by_index("eth", dev->seq, env_enetaddr);
|
||||
eth_env_get_enetaddr_by_index("eth", dev->seq, env_enetaddr);
|
||||
if (!is_zero_ethaddr(env_enetaddr)) {
|
||||
if (!is_zero_ethaddr(pdata->enetaddr) &&
|
||||
memcmp(pdata->enetaddr, env_enetaddr, ARP_HLEN)) {
|
||||
|
|
|
@ -24,7 +24,7 @@ void eth_parse_enetaddr(const char *addr, uchar *enetaddr)
|
|||
}
|
||||
}
|
||||
|
||||
int eth_getenv_enetaddr(const char *name, uchar *enetaddr)
|
||||
int eth_env_get_enetaddr(const char *name, uchar *enetaddr)
|
||||
{
|
||||
eth_parse_enetaddr(env_get(name), enetaddr);
|
||||
return is_valid_ethaddr(enetaddr);
|
||||
|
@ -34,7 +34,7 @@ int eth_env_set_enetaddr(const char *name, const uchar *enetaddr)
|
|||
{
|
||||
char buf[ARP_HLEN_ASCII + 1];
|
||||
|
||||
if (eth_getenv_enetaddr(name, (uchar *)buf))
|
||||
if (eth_env_get_enetaddr(name, (uchar *)buf))
|
||||
return -EEXIST;
|
||||
|
||||
sprintf(buf, "%pM", enetaddr);
|
||||
|
@ -42,12 +42,12 @@ int eth_env_set_enetaddr(const char *name, const uchar *enetaddr)
|
|||
return env_set(name, buf);
|
||||
}
|
||||
|
||||
int eth_getenv_enetaddr_by_index(const char *base_name, int index,
|
||||
int eth_env_get_enetaddr_by_index(const char *base_name, int index,
|
||||
uchar *enetaddr)
|
||||
{
|
||||
char enetvar[32];
|
||||
sprintf(enetvar, index ? "%s%daddr" : "%saddr", base_name, index);
|
||||
return eth_getenv_enetaddr(enetvar, enetaddr);
|
||||
return eth_env_get_enetaddr(enetvar, enetaddr);
|
||||
}
|
||||
|
||||
int eth_env_set_enetaddr_by_index(const char *base_name, int index,
|
||||
|
|
|
@ -137,7 +137,7 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
|
|||
unsigned char env_enetaddr[ARP_HLEN];
|
||||
int ret = 0;
|
||||
|
||||
eth_getenv_enetaddr_by_index(base_name, eth_number, env_enetaddr);
|
||||
eth_env_get_enetaddr_by_index(base_name, eth_number, env_enetaddr);
|
||||
|
||||
if (!is_zero_ethaddr(env_enetaddr)) {
|
||||
if (!is_zero_ethaddr(dev->enetaddr) &&
|
||||
|
|
Loading…
Reference in a new issue