ARM: dts: imx6ul-14x14-evk: Pass the "broken-cd" property

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

diff --git a/cmd/nvedit.c b/cmd/nvedit.c
index 99a3bc57b15feeb74c6f6d3cf41e1204b078831b..81d94cd193c6dd6c03d4c843cc6cae2a1284575a 100644 (file)
--- a/cmd/nvedit.c
+++ b/cmd/nvedit.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <u-boot/crc.h>
 #include <watchdog.h>
 #include <linux/stddef.h>
 #include <asm/byteorder.h>
@@ -360,7 +361,7 @@ ulong env_get_hex(const char *varname, ulong default_val)
 
 int eth_env_get_enetaddr(const char *name, uint8_t *enetaddr)
 {
-       eth_parse_enetaddr(env_get(name), enetaddr);
+       string_to_enetaddr(env_get(name), enetaddr);
        return is_valid_ethaddr(enetaddr);
 }
 
@@ -680,6 +681,23 @@ char *env_get(const char *name)
        return NULL;
 }
 
+/*
+ * Like env_get, but prints an error if envvar isn't defined in the
+ * environment.  It always returns what env_get does, so it can be used in
+ * place of env_get without changing error handling otherwise.
+ */
+char *from_env(const char *envvar)
+{
+       char *ret;
+
+       ret = env_get(envvar);
+
+       if (!ret)
+               printf("missing environment variable: %s\n", envvar);
+
+       return ret;
+}
+
 /*
  * Look up variable from environment for restricted C runtime env.
  */