Merge branch 'next' of git://git.denx.de/u-boot-video

[u-boot] / common / hwconfig.c

diff --git a/common/hwconfig.c b/common/hwconfig.c
index 4ae042ee33efe9327b5a647af910f343cb6fe3e5..e5186d77968f80d96ac1458f649ad2576512f1ef 100644 (file)
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -81,7 +81,7 @@ static const char *__hwconfig(const char *opt, size_t *arglen,
                                        "and before environment is ready\n");
                        return NULL;
                }
-               env_hwconfig = getenv("hwconfig");
+               env_hwconfig = env_get("hwconfig");
        }
 
        if (env_hwconfig) {
@@ -243,7 +243,7 @@ int main()
        const char *ret;
        size_t len;
 
-       setenv("hwconfig", "key1:subkey1=value1,subkey2=value2;key2:value3;;;;"
+       env_set("hwconfig", "key1:subkey1=value1,subkey2=value2;key2:value3;;;;"
                           "key3;:,:=;key4", 1);
 
        ret = hwconfig_arg("key1", &len);
@@ -274,7 +274,7 @@ int main()
        assert(hwconfig_arg("key4", &len) == NULL);
        assert(hwconfig_arg("bogus", &len) == NULL);
 
-       unsetenv("hwconfig");
+       unenv_set("hwconfig");
 
        assert(hwconfig(NULL) == 0);
        assert(hwconfig("") == 0);