leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

env: Rename eth_setenv_enetaddr() to eth_env_set_enetaddr()

Browse Source 
Rename this function for consistency with env_set().

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-08-03 12:22:11 -06:00 committed by Tom Rini
parent 018f530323
commit fd1e959e91
58 changed files with 83 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr)
debug("### Setting environment from EEPROM MAC address = "
"\"%pM\"\n",
env_enetaddr);
ret = !eth_setenv_enetaddr("ethaddr", rom_enetaddr);
ret = !eth_env_set_enetaddr("ethaddr", rom_enetaddr);
}
if (!ret)
printf("Failed to set mac address from EEPROM: %d\n", ret);

2
arch/arm/mach-omap2/utils.c
View File

@ -214,7 +214,7 @@ void omap_die_id_usbethaddr(void)
mac[4] = die_id[0] & 0xff;
mac[5] = (die_id[0] >> 8) & 0xff;
eth_setenv_enetaddr("usbethaddr", mac);
eth_env_set_enetaddr("usbethaddr", mac);
}
}

2
board/BuR/common/common.c
View File

@ -670,7 +670,7 @@ int board_eth_init(bd_t *bis)
if (mac) {
printf("using: %pM on ", mac);
eth_setenv_enetaddr("ethaddr", (const u8 *)mac);
eth_env_set_enetaddr("ethaddr", (const u8 *)mac);
}
}
writel(MII_MODE_ENABLE, &cdev->miisel);

6
board/CZ.NIC/turris_omnia/turris_omnia.c
View File

@ -515,17 +515,17 @@ int misc_init_r(void)
mac[5] = mac1[3];
if (is_valid_ethaddr(mac))
eth_setenv_enetaddr("ethaddr", mac);
eth_env_set_enetaddr("ethaddr", mac);
increment_mac(mac);
if (is_valid_ethaddr(mac))
eth_setenv_enetaddr("eth1addr", mac);
eth_env_set_enetaddr("eth1addr", mac);
increment_mac(mac);
if (is_valid_ethaddr(mac))
eth_setenv_enetaddr("eth2addr", mac);
eth_env_set_enetaddr("eth2addr", mac);
out:
#endif

2
board/LaCie/net2big_v2/net2big_v2.c
View File

@ -224,7 +224,7 @@ int misc_init_r(void)
if (!getenv("ethaddr")) {
uchar mac[6];
if (lacie_read_mac_address(mac) == 0)
eth_setenv_enetaddr("ethaddr", mac);
eth_env_set_enetaddr("ethaddr", mac);
}
#endif
init_leds();

2
board/LaCie/netspace_v2/netspace_v2.c
View File

@ -86,7 +86,7 @@ int misc_init_r(void)
if (!getenv("ethaddr")) {
uchar mac[6];
if (lacie_read_mac_address(mac) == 0)
eth_setenv_enetaddr("ethaddr", mac);
eth_env_set_enetaddr("ethaddr", mac);
}
#endif
return 0;

2
board/amlogic/odroid-c2/odroid-c2.c
View File

@ -48,7 +48,7 @@ int misc_init_r(void)
len = meson_sm_read_efuse(EFUSE_MAC_OFFSET,
mac_addr, EFUSE_MAC_SIZE);
if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
if (!getenv("serial#")) {

2
board/atmel/sama5d2_xplained/sama5d2_xplained.c
View File

@ -192,7 +192,7 @@ static int set_ethaddr_from_eeprom(void)
return -1;
}
return eth_setenv_enetaddr(ETHADDR_NAME, ethaddr);
return eth_env_set_enetaddr(ETHADDR_NAME, ethaddr);
}
#else
static int set_ethaddr_from_eeprom(void)

2
board/birdland/bav335x/board.c
View File

@ -396,7 +396,7 @@ int board_eth_init(bd_t *bis)
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
#ifdef CONFIG_DRIVER_TI_CPSW

6
board/bosch/shc/board.c
View File

@ -460,7 +460,7 @@ int board_late_init(void)
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
if (shc_eeprom_valid)
if (is_valid_ethaddr(header.mac_addr))
eth_setenv_enetaddr("ethaddr", header.mac_addr);
eth_env_set_enetaddr("ethaddr", header.mac_addr);
#endif
return 0;
@ -549,7 +549,7 @@ int board_eth_init(bd_t *bis)
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
writel(MII_MODE_ENABLE, &cdev->miisel);
@ -565,7 +565,7 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_USB_ETHER) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("usbnet_devaddr", mac_addr);
eth_env_set_enetaddr("usbnet_devaddr", mac_addr);
rv = usb_eth_initialize(bis);
if (rv < 0)

2
board/compulab/cl-som-am57x/eth.c
View File

@ -107,7 +107,7 @@ static int cl_som_am57x_handle_mac_address(char *env_name, uint port_num)
if (!is_valid_ethaddr(enetaddr))
return -1;
ret = eth_setenv_enetaddr(env_name, enetaddr);
ret = eth_env_set_enetaddr(env_name, enetaddr);
if (ret)
printf("cl-som-am57x: Failed to set Eth port %d MAC address\n",
port_num);

2
board/compulab/cm_fx6/cm_fx6.c
View File

@ -481,7 +481,7 @@ static int handle_mac_address(char *env_var, uint eeprom_bus)
if (!is_valid_ethaddr(enetaddr))
return -1;
return eth_setenv_enetaddr(env_var, enetaddr);
return eth_env_set_enetaddr(env_var, enetaddr);
}
#define SB_FX6_I2C_EEPROM_BUS 0

2
board/compulab/cm_t335/cm_t335.c
View File

@ -117,7 +117,7 @@ static int handle_mac_address(void)
if (!is_valid_ethaddr(enetaddr))
return -1;
return eth_setenv_enetaddr("ethaddr", enetaddr);
return eth_env_set_enetaddr("ethaddr", enetaddr);
}
#define AR8051_PHY_DEBUG_ADDR_REG 0x1d

2
board/compulab/cm_t35/cm_t35.c
View File

@ -445,7 +445,7 @@ static int handle_mac_address(void)
if (!is_valid_ethaddr(enetaddr))
return -1;
return eth_setenv_enetaddr("ethaddr", enetaddr);
return eth_env_set_enetaddr("ethaddr", enetaddr);
}
/*

2
board/compulab/cm_t3517/cm_t3517.c
View File

@ -182,7 +182,7 @@ static int cm_t3517_handle_mac_address(void)
if (!is_valid_ethaddr(enetaddr))
return -1;
return eth_setenv_enetaddr("ethaddr", enetaddr);
return eth_env_set_enetaddr("ethaddr", enetaddr);
}
#define SB_T35_ETH_RST_GPIO 164

2
board/compulab/cm_t54/cm_t54.c
View File

@ -172,7 +172,7 @@ static int handle_mac_address(void)
if (!is_valid_ethaddr(enetaddr))
return -1;
return eth_setenv_enetaddr("usbethaddr", enetaddr);
return eth_env_set_enetaddr("usbethaddr", enetaddr);
}
int board_eth_init(bd_t *bis)

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

@ -147,7 +147,7 @@ int misc_init_r(void)
if (!enetaddr_found) {
if (!spi_mac_read) {
if (is_valid_ethaddr(buff)) {
if (eth_setenv_enetaddr("ethaddr", buff)) {
if (eth_env_set_enetaddr("ethaddr", buff)) {
printf("Warning: Failed to "
"set MAC address from SPI flash\n");
}

4
board/gateworks/gw_ventana/gw_ventana.c
View File

@ -771,11 +771,11 @@ int misc_init_r(void)
/* initialize env from EEPROM */
if (test_bit(EECONFIG_ETH0, info->config) &&
!getenv("ethaddr")) {
eth_setenv_enetaddr("ethaddr", info->mac0);
eth_env_set_enetaddr("ethaddr", info->mac0);
}
if (test_bit(EECONFIG_ETH1, info->config) &&
!getenv("eth1addr")) {
eth_setenv_enetaddr("eth1addr", info->mac1);
eth_env_set_enetaddr("eth1addr", info->mac1);
}
/* board serial-number */

4
board/grinn/chiliboard/board.c
View File

@ -130,7 +130,7 @@ int board_late_init(void)
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
mac_lo = readl(&cdev->macid1l);
@ -144,7 +144,7 @@ int board_late_init(void)
if (!getenv("eth1addr")) {
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("eth1addr", mac_addr);
eth_env_set_enetaddr("eth1addr", mac_addr);
}
#endif

2
board/gumstix/pepper/board.c
View File

@ -250,7 +250,7 @@ int board_eth_init(bd_t *bis)
mac_addr[4] = mac_lo & 0xFF;
mac_addr[5] = (mac_lo & 0xFF00) >> 8;
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
writel((RGMII_MODE_ENABLE | RGMII_INT_DELAY), &cdev->miisel);

2
board/isee/igep003x/board.c
View File

@ -275,7 +275,7 @@ int board_eth_init(bd_t *bis)
mac_addr[4] = mac_lo & 0xFF;
mac_addr[5] = (mac_lo & 0xFF00) >> 8;
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
writel((GMII1_SEL_RMII | RMII1_IO_CLK_EN),

2
board/kosagi/novena/novena.c
View File

@ -264,7 +264,7 @@ int misc_init_r(void)
}
/* Set ethernet address from EEPROM. */
eth_setenv_enetaddr("ethaddr", data.mac);
eth_env_set_enetaddr("ethaddr", data.mac);
return ret;
}

2
board/logicpd/zoom1/zoom1.c
View File

@ -133,7 +133,7 @@ int board_eth_init(bd_t *bis)
if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
dev = eth_get_dev_by_index(0);
if (dev) {
eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
eth_env_set_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
} else {
printf("zoom1: Couldn't get eth device\n");
rc = -1;

2
board/phytec/pcm051/board.c
View File

@ -229,7 +229,7 @@ int board_eth_init(bd_t *bis)
mac_addr[5] = (mac_lo & 0xFF00) >> 8;
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
else
goto try_usbether;
}

2
board/raspberrypi/rpi/rpi.c
View File

@ -300,7 +300,7 @@ static void set_usbethaddr(void)
return;
}
eth_setenv_enetaddr("usbethaddr", msg->get_mac_address.body.resp.mac);
eth_env_set_enetaddr("usbethaddr", msg->get_mac_address.body.resp.mac);
if (!getenv("ethaddr"))
env_set("ethaddr", getenv("usbethaddr"));

2
board/renesas/blanche/blanche.c
View File

@ -421,7 +421,7 @@ int board_eth_init(bd_t *bis)
if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
dev = eth_get_dev_by_index(0);
if (dev) {
eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
eth_env_set_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
} else {
printf("blanche: Couldn't get eth device\n");
rc = -1;

2
board/rockchip/tinker_rk3288/tinker-rk3288.c
View File

@ -29,7 +29,7 @@ int rk_board_late_init(void)
return 0;
if (is_valid_ethaddr(ethaddr))
eth_setenv_enetaddr("ethaddr", ethaddr);
eth_env_set_enetaddr("ethaddr", ethaddr);
return 0;
}

2
board/samtec/vining_2000/vining_2000.c
View File

@ -132,7 +132,7 @@ int board_eth_init(bd_t *bis)
/* just to get secound mac address */
imx_get_mac_from_fuse(1, eth1addr);
if (!getenv("eth1addr") && is_valid_ethaddr(eth1addr))
eth_setenv_enetaddr("eth1addr", eth1addr);
eth_env_set_enetaddr("eth1addr", eth1addr);
imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads));

2
board/samtec/vining_fpga/socfpga.c
View File

@ -93,7 +93,7 @@ int misc_init_r(void)
/* Set ethernet address from EEPROM. */
if (!getenv("ethaddr") && is_valid_ethaddr(&data[0x62]))
eth_setenv_enetaddr("ethaddr", &data[0x62]);
eth_env_set_enetaddr("ethaddr", &data[0x62]);
return 0;
}

2
board/siemens/common/factoryset.c
View File

@ -292,7 +292,7 @@ static int factoryset_mac_env_set(void)
}
}
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
return 0;
}

2
board/siemens/pxm2/board.c
View File

@ -225,7 +225,7 @@ int board_eth_init(bd_t *bis)
if (!is_valid_ethaddr(factory_dat.mac))
printf("Error: no valid mac address\n");
else
eth_setenv_enetaddr("ethaddr", factory_dat.mac);
eth_env_set_enetaddr("ethaddr", factory_dat.mac);
#endif /* #ifdef CONFIG_FACTORYSET */
/* Set rgmii mode and enable rmii clock to be sourced from chip */

2
board/silica/pengwyn/board.c
View File

@ -184,7 +184,7 @@ int board_eth_init(bd_t *bis)
mac_addr[5] = (mac_lo & 0xFF00) >> 8;
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
else
return n;
}

2
board/spear/common/spr_misc.c
View File

@ -54,7 +54,7 @@ int misc_init_r(void)
uchar mac_id[6];
if (!eth_getenv_enetaddr("ethaddr", mac_id) && !i2c_read_mac(mac_id))
eth_setenv_enetaddr("ethaddr", mac_id);
eth_env_set_enetaddr("ethaddr", mac_id);
#endif
env_set("verify", "n");

2
board/sunxi/board.c
View File

@ -705,7 +705,7 @@ static void setup_environment(const void *fdt)
mac_addr[4] = (sid[3] >> 8) & 0xff;
mac_addr[5] = (sid[3] >> 0) & 0xff;
eth_setenv_enetaddr(ethaddr, mac_addr);
eth_env_set_enetaddr(ethaddr, mac_addr);
}
if (!getenv("serial#")) {

6
board/tcl/sl50/board.c
View File

@ -326,7 +326,7 @@ int board_eth_init(bd_t *bis)
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
#ifdef CONFIG_DRIVER_TI_CPSW
@ -342,7 +342,7 @@ int board_eth_init(bd_t *bis)
if (!getenv("eth1addr")) {
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("eth1addr", mac_addr);
eth_env_set_enetaddr("eth1addr", mac_addr);
}
@ -373,7 +373,7 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_USB_ETHER) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
if (is_valid_ether_addr(mac_addr))
eth_setenv_enetaddr("usbnet_devaddr", mac_addr);
eth_env_set_enetaddr("usbnet_devaddr", mac_addr);
rv = usb_eth_initialize(bis);
if (rv < 0)

2
board/technologic/ts4800/ts4800.c
View File

@ -178,7 +178,7 @@ static int fec_get_mac_from_register(uint32_t base_addr)
ethaddr[i] = (reg_mac[i / 4] >> ((i % 4) * 8)) & 0xFF;
if (is_valid_ethaddr(ethaddr)) {
eth_setenv_enetaddr("ethaddr", ethaddr);
eth_env_set_enetaddr("ethaddr", ethaddr);
return 0;
}

2
board/theobroma-systems/puma_rk3399/puma-rk3399.c
View File

@ -89,7 +89,7 @@ static void setup_macaddr(void)
/* Make this a valid MAC address and set it */
mac_addr[0] &= 0xfe; /* clear multicast bit */
mac_addr[0] |= 0x02; /* set local assignment bit (IEEE802) */
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
#endif
return;

6
board/ti/am335x/board.c
View File

@ -749,7 +749,7 @@ int board_late_init(void)
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
mac_lo = readl(&cdev->macid1l);
@ -763,7 +763,7 @@ int board_late_init(void)
if (!getenv("eth1addr")) {
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("eth1addr", mac_addr);
eth_env_set_enetaddr("eth1addr", mac_addr);
}
#endif
@ -908,7 +908,7 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_USB_ETHER) && \
(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("usbnet_devaddr", mac_addr);
eth_env_set_enetaddr("usbnet_devaddr", mac_addr);
rv = usb_eth_initialize(bis);
if (rv < 0)

4
board/ti/am43xx/board.c
View File

@ -794,7 +794,7 @@ int board_eth_init(bd_t *bis)
if (!getenv("ethaddr")) {
puts("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
mac_lo = readl(&cdev->macid1l);
@ -808,7 +808,7 @@ int board_eth_init(bd_t *bis)
if (!getenv("eth1addr")) {
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("eth1addr", mac_addr);
eth_env_set_enetaddr("eth1addr", mac_addr);
}
if (board_is_eposevm()) {

10
board/ti/am57xx/board.c
View File

@ -937,7 +937,7 @@ int board_eth_init(bd_t *bis)
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
mac_lo = readl((*ctrl)->control_core_mac_id_1_lo);
@ -951,7 +951,7 @@ int board_eth_init(bd_t *bis)
if (!getenv("eth1addr")) {
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("eth1addr", mac_addr);
eth_env_set_enetaddr("eth1addr", mac_addr);
}
ctrl_val = readl((*ctrl)->control_core_control_io1) & (~0x33);
@ -986,9 +986,9 @@ int board_eth_init(bd_t *bis)
for (i = 0; i < num_macs; i++) {
u64_to_mac(mac1 + i, mac_addr);
if (is_valid_ethaddr(mac_addr)) {
eth_setenv_enetaddr_by_index("eth",
i + 2,
mac_addr);
eth_env_set_enetaddr_by_index("eth",
i + 2,
mac_addr);
}
}
}

4
board/ti/common/board_detect.c
View File

@ -451,8 +451,8 @@ void board_ti_set_ethaddr(int index)
for (i = 0; i < num_macs; i++) {
u64_to_mac(mac1 + i, mac_addr);
if (is_valid_ethaddr(mac_addr)) {
eth_setenv_enetaddr_by_index("eth", i + index,
mac_addr);
eth_env_set_enetaddr_by_index("eth", i + index,
mac_addr);
}
}
}

4
board/ti/dra7xx/evm.c
View File

@ -897,7 +897,7 @@ int board_eth_init(bd_t *bis)
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
mac_lo = readl((*ctrl)->control_core_mac_id_1_lo);
@ -911,7 +911,7 @@ int board_eth_init(bd_t *bis)
if (!getenv("eth1addr")) {
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("eth1addr", mac_addr);
eth_env_set_enetaddr("eth1addr", mac_addr);
}
ctrl_val = readl((*ctrl)->control_core_control_io1) & (~0x33);

2
board/ti/evm/evm.c
View File

@ -300,7 +300,7 @@ int board_eth_init(bd_t *bis)
if (!eth_getenv_enetaddr(STR_ENV_ETHADDR, eth_addr)) {
dev = eth_get_dev_by_index(0);
if (dev) {
eth_setenv_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
eth_env_set_enetaddr(STR_ENV_ETHADDR, dev->enetaddr);
} else {
printf("omap3evm: Couldn't get eth device\n");
rc = -1;

2
board/ti/ti814x/evm.c
View File

@ -179,7 +179,7 @@ int board_eth_init(bd_t *bis)
mac_addr[5] = (mac_lo & 0xFF00) >> 8;
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
else
printf("Unable to read MAC address. Set <ethaddr>\n");
}

2
board/ti/ti816x/evm.c
View File

@ -51,7 +51,7 @@ int board_eth_init(bd_t *bis)
mac_addr[5] = (mac_lo & 0xFF00) >> 8;
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
else
printf("Unable to read MAC address. Set <ethaddr>\n");
}

2
board/timll/devkit8000/devkit8000.c
View File

@ -111,7 +111,7 @@ int misc_init_r(void)
enetaddr[3] = (die_id_0 & 0x00ff0000) >> 16;
enetaddr[4] = (die_id_0 & 0x0000ff00) >> 8;
enetaddr[5] = (die_id_0 & 0x000000ff);
eth_setenv_enetaddr("ethaddr", enetaddr);
eth_env_set_enetaddr("ethaddr", enetaddr);
}
#endif

4
board/toradex/common/tdx-common.c
View File

@ -87,7 +87,7 @@ int show_board_info(void)
* set the one from config block if not
*/
if (!eth_getenv_enetaddr("ethaddr", ethaddr))
eth_setenv_enetaddr("ethaddr", (u8 *)&tdx_eth_addr);
eth_env_set_enetaddr("ethaddr", (u8 *)&tdx_eth_addr);
#ifdef CONFIG_TDX_CFG_BLOCK_2ND_ETHADDR
if (!eth_getenv_enetaddr("eth1addr", ethaddr)) {
@ -97,7 +97,7 @@ int show_board_info(void)
*/
memcpy(ethaddr, &tdx_eth_addr, 6);
ethaddr[3] += 0x10;
eth_setenv_enetaddr("eth1addr", ethaddr);
eth_env_set_enetaddr("eth1addr", ethaddr);
}
#endif

2
board/vscom/baltos/board.c
View File

@ -457,7 +457,7 @@ int board_eth_init(bd_t *bis)
printf("<ethaddr> not set. Validating first E-fuse MAC\n");
if (is_valid_ethaddr(mac_addr))
eth_setenv_enetaddr("ethaddr", mac_addr);
eth_env_set_enetaddr("ethaddr", mac_addr);
}
#ifdef CONFIG_DRIVER_TI_CPSW

4
doc/README.enetaddr
View File

@ -98,12 +98,12 @@ if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {
}
/* enetaddr is now set to the value stored in the ethaddr env var */
* int eth_setenv_enetaddr(char *name, const uchar *enetaddr);
* int eth_env_set_enetaddr(char *name, const uchar *enetaddr);
Store the MAC address into the named environment variable. The return value is
the same as the env_set() function.
uchar enetaddr[6] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55 };
eth_setenv_enetaddr("ethaddr", enetaddr);
eth_env_set_enetaddr("ethaddr", enetaddr);
/* the "ethaddr" env var should now be set to "00:11:22:33:44:55" */
* the %pM format modifier

2
drivers/net/fec_mxc.c
View File

@ -1097,7 +1097,7 @@ static int fec_probe(bd_t *bd, int dev_id, uint32_t base_addr,
else
strcpy(mac, "ethaddr");
if (!getenv(mac))
eth_setenv_enetaddr(mac, ethaddr);
eth_env_set_enetaddr(mac, ethaddr);
}
return ret;
err4:

2
drivers/net/lan91c96.c
View File

@ -710,7 +710,7 @@ static int smc_get_ethaddr(bd_t *bd, struct eth_device *dev)
printf("\n*** ERROR: ethaddr is NOT set !!\n");
return -1;
}
eth_setenv_enetaddr("ethaddr", v_mac);
eth_env_set_enetaddr("ethaddr", v_mac);
}
smc_set_mac_addr(v_mac); /* use old function to update smc default */

2
drivers/net/ne2000_base.c
View File

@ -723,7 +723,7 @@ static int ne2k_setup_driver(struct eth_device *dev)
* returns -1 due to eth_getenv_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_setenv_enetaddr("ethaddr", dev->enetaddr);
eth_env_set_enetaddr("ethaddr", dev->enetaddr);
}
return 0;
}

2
drivers/usb/gadget/ether.c
View File

@ -2685,7 +2685,7 @@ static int usb_eth_probe(struct udevice *dev)
l_priv = priv;
get_ether_addr(CONFIG_USBNET_DEVADDR, pdata->enetaddr);
eth_setenv_enetaddr("usbnet_devaddr", pdata->enetaddr);
eth_env_set_enetaddr("usbnet_devaddr", pdata->enetaddr);
return 0;
}

6
include/net.h
View File

@ -240,10 +240,10 @@ 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_setenv_enetaddr(const char *name, const uchar *enetaddr);
int eth_env_set_enetaddr(const char *name, const uchar *enetaddr);
/**
* eth_setenv_enetaddr_by_index() - set the MAC address environment variable
* eth_env_set_enetaddr_by_index() - set the MAC address environment variable
*
* This sets up an environment variable with the given MAC address (@enetaddr).
* The environment variable to be set is defined by <@base_name><@index>addr.
@ -255,7 +255,7 @@ int eth_setenv_enetaddr(const char *name, const uchar *enetaddr);
* @enetaddr: Pointer to MAC address to put into the variable
* @return 0 if OK, other value on error
*/
int eth_setenv_enetaddr_by_index(const char *base_name, int index,
int eth_env_set_enetaddr_by_index(const char *base_name, int index,
uchar *enetaddr);

2
net/eth-uclass.c
View File

@ -510,7 +510,7 @@ static int eth_post_probe(struct udevice *dev)
/* Override the ROM MAC address */
memcpy(pdata->enetaddr, env_enetaddr, ARP_HLEN);
} else if (is_valid_ethaddr(pdata->enetaddr)) {
eth_setenv_enetaddr_by_index("eth", dev->seq, pdata->enetaddr);
eth_env_set_enetaddr_by_index("eth", dev->seq, pdata->enetaddr);
printf("\nWarning: %s using MAC address from ROM\n",
dev->name);
} else if (is_zero_ethaddr(pdata->enetaddr) ||

6
net/eth_common.c
View File

@ -30,7 +30,7 @@ int eth_getenv_enetaddr(const char *name, uchar *enetaddr)
return is_valid_ethaddr(enetaddr);
}
int eth_setenv_enetaddr(const char *name, const uchar *enetaddr)
int eth_env_set_enetaddr(const char *name, const uchar *enetaddr)
{
char buf[ARP_HLEN_ASCII + 1];
@ -50,12 +50,12 @@ int eth_getenv_enetaddr_by_index(const char *base_name, int index,
return eth_getenv_enetaddr(enetvar, enetaddr);
}
int eth_setenv_enetaddr_by_index(const char *base_name, int index,
int eth_env_set_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_setenv_enetaddr(enetvar, enetaddr);
return eth_env_set_enetaddr(enetvar, enetaddr);
}
void eth_common_init(void)

4
net/eth_internal.h
View File

@ -13,7 +13,7 @@
void eth_common_init(void);
/**
* eth_setenv_enetaddr_by_index() - set the MAC address environment variable
* eth_env_set_enetaddr_by_index() - set the MAC address environment variable
*
* This sets up an environment variable with the given MAC address (@enetaddr).
* The environment variable to be set is defined by <@base_name><@index>addr.
@ -25,7 +25,7 @@ void eth_common_init(void);
* @enetaddr: Pointer to MAC address to put into the variable
* @return 0 if OK, other value on error
*/
int eth_setenv_enetaddr_by_index(const char *base_name, int index,
int eth_env_set_enetaddr_by_index(const char *base_name, int index,
uchar *enetaddr);
int eth_mac_skip(int index);

4
net/eth_legacy.c
View File

@ -152,8 +152,8 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name,
memcpy(dev->enetaddr, env_enetaddr, ARP_HLEN);
} else if (is_valid_ethaddr(dev->enetaddr)) {
eth_setenv_enetaddr_by_index(base_name, eth_number,
dev->enetaddr);
eth_env_set_enetaddr_by_index(base_name, eth_number,
dev->enetaddr);
} else if (is_zero_ethaddr(dev->enetaddr)) {
#ifdef CONFIG_NET_RANDOM_ETHADDR
net_random_ethaddr(dev->enetaddr);