env: Rename eth_setenv_enetaddr() to eth_env_set_enetaddr()

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

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);

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

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();

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;

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#")) {

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)

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

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)

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);

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

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

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);
}
/*

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

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)

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");
}

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 */

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

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);

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),

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;
}

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;

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;
}

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"));

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;

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;
}

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));

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;
}

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;
}

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 */

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;
}

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");

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#")) {

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)

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;
}

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;

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)

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()) {

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);
}
}
}

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);
}
}
}

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);

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;

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");
}

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");
}

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

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

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