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 aaa14642736f2a3ce5da36c0cf3c0138372a4806..7e7056cf71c5012150a1328a0cd8defee3fd6871 100644 (file)
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -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,7 +933,7 @@ 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))
@@ -949,7 +949,7 @@ 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_env_set_enetaddr("eth1addr", mac_addr);
        }