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

[u-boot] / board / ti / am57xx / board.c

diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 126c9ef694f93185fe34a17476a68fe0fd118883..7e7056cf71c5012150a1328a0cd8defee3fd6871 100644 (file)
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -592,7 +592,7 @@ void am57x_idk_lcd_detect(void)
                /* we will let default be "no lcd" */
        }
 out:
-       setenv("idk_lcd", idk_lcd);
+       env_set("idk_lcd", idk_lcd);
        return;
 }
 
@@ -612,7 +612,7 @@ int board_late_init(void)
         * on HS devices.
         */
        if (get_device_type() == HS_DEVICE)
-               setenv("boot_fit", "1");
+               env_set("boot_fit", "1");
 
        /*
         * Set the GPIO7 Pad to POWERHOLD. This has higher priority
@@ -743,7 +743,7 @@ int spl_start_uboot(void)
 #ifdef CONFIG_SPL_ENV_SUPPORT
        env_init();
        env_load();
-       if (getenv_yesno("boot_os") != 1)
+       if (env_get_yesno("boot_os") != 1)
                return 1;
 #endif
 
@@ -933,11 +933,11 @@ int board_eth_init(bd_t *bis)
        mac_addr[4] = (mac_lo & 0xFF00) >> 8;
        mac_addr[5] = mac_lo & 0xFF;
 
-       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);
        }
 
        mac_lo = readl((*ctrl)->control_core_mac_id_1_lo);
@@ -949,9 +949,9 @@ int board_eth_init(bd_t *bis)
        mac_addr[4] = (mac_lo & 0xFF00) >> 8;
        mac_addr[5] = mac_lo & 0xFF;
 
-       if (!getenv("eth1addr")) {
+       if (!env_get("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);
                                }
                        }
                }