env: Rename getenv_hex(), getenv_yesno(), getenv_ulong()

[people/ms/u-boot.git] / board / birdland / bav335x / board.c

diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c
index d1e1c8cbd399bbff69bae9c4c617335dca783b7a..f284568ec92098a3380c056df495ecffb1a5b08a 100644 (file)
--- a/board/birdland/bav335x/board.c
+++ b/board/birdland/bav335x/board.c
@@ -162,8 +162,8 @@ int spl_start_uboot(void)
 
 #ifdef CONFIG_SPL_ENV_SUPPORT
        env_init();
-       env_relocate_spec();
-       if (getenv_yesno("boot_os") != 1)
+       env_load();
+       if (env_get_yesno("boot_os") != 1)
                return 1;
 #endif
 
@@ -301,8 +301,8 @@ int board_init(void)
 int board_late_init(void)
 {
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-       setenv("board_name", "BAV335xB");
-       setenv("board_rev", "B"); /* Fix me, but why bother.. */
+       env_set("board_name", "BAV335xB");
+       env_set("board_rev", "B"); /* Fix me, but why bother.. */
 #endif
        return 0;
 }
@@ -363,7 +363,7 @@ static struct cpsw_platform_data cpsw_data = {
 #if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\
                defined(CONFIG_SPL_BUILD)) || \
        ((defined(CONFIG_DRIVER_TI_CPSW) || \
-         defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
+         defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
         !defined(CONFIG_SPL_BUILD))
 int board_eth_init(bd_t *bis)
 {
@@ -384,7 +384,7 @@ int board_eth_init(bd_t *bis)
        ecode = read_eeprom(&header);
        /* if we have a valid EE, get mac address from there */
        if ((ecode == 0) &&
-           is_valid_ether_addr((const u8 *)&header.mac_addr[0][0])) {
+           is_valid_ethaddr((const u8 *)&header.mac_addr[0][0])) {
                memcpy(mac_addr, (const void *)&header.mac_addr[0][0], 6);
        }
 
@@ -392,11 +392,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_ether_addr(mac_addr))
-                       eth_setenv_enetaddr("ethaddr", mac_addr);
+               if (is_valid_ethaddr(mac_addr))
+                       eth_env_set_enetaddr("ethaddr", mac_addr);
        }
 
 #ifdef CONFIG_DRIVER_TI_CPSW