mmc: fsl_esdhc: drop i.MX DDR support code

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

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 751b77d0e986ae918438b1e5c33f54c8ae75ef34..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>
@@ -94,11 +94,11 @@ static int env_print(char *name, int flag)
        ssize_t len;
 
        if (name) {             /* print a single name */
-               ENTRY e, *ep;
+               struct env_entry e, *ep;
 
                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);
@@ -225,7 +225,7 @@ static int _do_env_set(int flag, int argc, char * const argv[], int env_flag)
 {
        int   i, len;
        char  *name, *value, *s;
-       ENTRY e, *ep;
+       struct env_entry e, *ep;
 
        debug("Initial value for argc=%d\n", argc);
 
@@ -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",
@@ -358,18 +358,6 @@ ulong env_get_hex(const char *varname, ulong default_val)
        return value;
 }
 
-void eth_parse_enetaddr(const char *addr, uint8_t *enetaddr)
-{
-       char *end;
-       int i;
-
-       for (i = 0; i < 6; ++i) {
-               enetaddr[i] = addr ? simple_strtoul(addr, &end, 16) : 0;
-               if (addr)
-                       addr = (*end) ? end + 1 : end;
-       }
-}
-
 int eth_env_get_enetaddr(const char *name, uint8_t *enetaddr)
 {
        eth_parse_enetaddr(env_get(name), enetaddr);
@@ -485,7 +473,7 @@ static int print_static_binding(const char *var_name, const char *callback_name,
        return 0;
 }
 
-static int print_active_callback(ENTRY *entry)
+static int print_active_callback(struct env_entry *entry)
 {
        struct env_clbk_tbl *clbkp;
        int i;
@@ -566,7 +554,7 @@ static int print_static_flags(const char *var_name, const char *flags,
        return 0;
 }
 
-static int print_active_flags(ENTRY *entry)
+static int print_active_flags(struct env_entry *entry)
 {
        enum env_flags_vartype type;
        enum env_flags_varaccess access;
@@ -674,13 +662,13 @@ static int do_env_edit(cmd_tbl_t *cmdtp, int flag, int argc,
 char *env_get(const char *name)
 {
        if (gd->flags & GD_FLG_ENV_READY) { /* after import into hashtable */
-               ENTRY e, *ep;
+               struct env_entry e, *ep;
 
                WATCHDOG_RESET();
 
                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;
        }
@@ -826,13 +814,13 @@ static int do_env_default(cmd_tbl_t *cmdtp, int flag,
        debug("Final value for argc=%d\n", argc);
        if (all && (argc == 0)) {
                /* Reset the whole environment */
-               set_default_env("## Resetting to default environment\n",
+               env_set_default("## Resetting to default environment\n",
                                env_flag);
                return 0;
        }
        if (!all && (argc > 0)) {
                /* Reset individual variables */
-               set_default_vars(argc, argv, env_flag);
+               env_set_default_vars(argc, argv, env_flag);
                return 0;
        }
 
@@ -1014,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));
@@ -1274,14 +1262,14 @@ static int do_env_info(cmd_tbl_t *cmdtp, int flag,
 static int do_env_exists(cmd_tbl_t *cmdtp, int flag, int argc,
                       char * const argv[])
 {
-       ENTRY e, *ep;
+       struct env_entry e, *ep;
 
        if (argc < 2)
                return CMD_RET_USAGE;
 
        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;
 }