rockchip: video: rk_hdmi: migrate to livetree

[people/ms/u-boot.git] / net / net.c

diff --git a/net/net.c b/net/net.c
index be33c66b3ac6ab8e6dd80be8c735cfbbda338efc..4259c9e321d6905efef6ca5abe441e89943eab9f 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -319,7 +319,7 @@ U_BOOT_ENV_CALLBACK(dnsip, on_dnsip);
 void net_auto_load(void)
 {
 #if defined(CONFIG_CMD_NFS)
-       const char *s = getenv("autoload");
+       const char *s = env_get("autoload");
 
        if (s != NULL && strcmp(s, "NFS") == 0) {
                /*
@@ -329,7 +329,7 @@ void net_auto_load(void)
                return;
        }
 #endif
-       if (getenv_yesno("autoload") == 0) {
+       if (env_get_yesno("autoload") == 0) {
                /*
                 * Just use BOOTP/RARP to configure system;
                 * Do not use TFTP to load the bootfile.
@@ -668,7 +668,7 @@ int net_start_again(void)
        unsigned long retrycnt = 0;
        int ret;
 
-       nretry = getenv("netretry");
+       nretry = env_get("netretry");
        if (nretry) {
                if (!strcmp(nretry, "yes"))
                        retry_forever = 1;
@@ -1536,7 +1536,7 @@ ushort string_to_vlan(const char *s)
        return htons(id);
 }
 
-ushort getenv_vlan(char *var)
+ushort env_get_vlan(char *var)
 {
-       return string_to_vlan(getenv(var));
+       return string_to_vlan(env_get(var));
 }