Merge git://www.denx.de/git/u-boot-imx

[u-boot] / board / bosch / shc / board.c

diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c
index 38577f30f15ab91a9dd68f59343cca8f711e4958..999ed95c31d95a804fc57f8222be81d1938c1e59 100644 (file)
--- a/board/bosch/shc/board.c
+++ b/board/bosch/shc/board.c
@@ -251,7 +251,7 @@ static void check_button_status(void)
 
        if (value == 0) {
                printf("front button activated !\n");
-               setenv("harakiri", "1");
+               env_set("harakiri", "1");
        }
 }
 
@@ -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;
@@ -545,11 +545,11 @@ int board_eth_init(bd_t *bis)
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
        (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
-       if (!getenv("ethaddr")) {
+       if (!env_get("ethaddr")) {
                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)