arm64: zynqmp: Enable Micrel phy support for xilinx zc1275 revB

[oweals/u-boot.git] / cmd / nvedit.c

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 39140c07339c66e6f7f92c05e7f42261777f3753..1cb0bc1460b951c146078d007cd8a4d62db30e53 100644 (file)
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -28,7 +28,7 @@
 #include <command.h>
 #include <console.h>
 #include <env.h>
-#include <environment.h>
+#include <env_internal.h>
 #include <search.h>
 #include <errno.h>
 #include <malloc.h>
@@ -98,7 +98,7 @@ static int env_print(char *name, int flag)
 
                e.key = name;
                e.data = NULL;
-               hsearch_r(e, FIND, &ep, &env_htab, flag);
+               hsearch_r(e, ENV_FIND, &ep, &env_htab, flag);
                if (ep == NULL)
                        return 0;
                len = printf("%s=%s\n", ep->key, ep->data);
@@ -288,7 +288,7 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag)
 
        e.key   = name;
        e.data  = value;
-       hsearch_r(e, ENTER, &ep, &env_htab, env_flag);
+       hsearch_r(e, ENV_ENTER, &ep, &env_htab, env_flag);
        free(value);
        if (!ep) {
                printf("## Error inserting \"%s\" variable, errno=%d\n",
@@ -668,7 +668,7 @@ char *env_get(const char *name)
 
                e.key   = name;
                e.data  = NULL;
-               hsearch_r(e, FIND, &ep, &env_htab, 0);
+               hsearch_r(e, ENV_FIND, &ep, &env_htab, 0);
 
                return ep ? ep->data : NULL;
        }
@@ -1002,7 +1002,7 @@ NXTARG:           ;
                envp->crc = crc32(0, envp->data,
                                size ? size - offsetof(env_t, data) : ENV_SIZE);
 #ifdef CONFIG_ENV_ADDR_REDUND
-               envp->flags = ACTIVE_FLAG;
+               envp->flags = ENV_REDUND_ACTIVE;
 #endif
        }
        env_set_hex("filesize", len + offsetof(env_t, data));
@@ -1269,7 +1269,7 @@ static int do_env_exists(cmd_tbl_t *cmdtp, int flag, int argc,
 
        e.key = argv[1];
        e.data = NULL;
-       hsearch_r(e, FIND, &ep, &env_htab, 0);
+       hsearch_r(e, ENV_FIND, &ep, &env_htab, 0);
 
        return (ep == NULL) ? 1 : 0;
 }