env: Couple networking-related variable flags to CONFIG_NET

Boards may set networking variables programmatically, thus may have
CONFIG_NET on but CONFIG_CMD_NET off. The IOT2050 is an example.

CC: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/env/flags.c b/env/flags.c
index e3e833c4333c440f7ff72fcf6d0c0ee15834edc3..e2866361dfe4f22b009a77b06f43fd2be9433dc0 100644 (file)
--- a/env/flags.c
+++ b/env/flags.c
@@ -22,7 +22,7 @@
 #include <env_internal.h>
 #endif
 
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
 #define ENV_FLAGS_NET_VARTYPE_REPS "im"
 #else
 #define ENV_FLAGS_NET_VARTYPE_REPS ""
@@ -57,7 +57,7 @@ static const char * const env_flags_vartype_names[] = {
        "decimal",
        "hexadecimal",
        "boolean",
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
        "IP address",
        "MAC address",
 #endif
@@ -211,7 +211,7 @@ static void skip_num(int hex, const char *value, const char **end,
                *end = value;
 }
 
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
 int eth_validate_ethaddr_str(const char *addr)
 {
        const char *end;
@@ -244,7 +244,7 @@ static int _env_flags_validate_type(const char *value,
        enum env_flags_vartype type)
 {
        const char *end;
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
        const char *cur;
        int i;
 #endif
@@ -273,7 +273,7 @@ static int _env_flags_validate_type(const char *value,
                if (value[1] != '\0')
                        return -1;
                break;
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
        case env_flags_vartype_ipaddr:
                cur = value;
                for (i = 0; i < 4; i++) {

diff --git a/include/env_flags.h b/include/env_flags.h
index 6bd574c2bdb13f6d20ba561ba2d66ece5f457c6b..7de58cc57c34127ec7f459255040610ada24186c 100644 (file)
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -12,7 +12,7 @@ enum env_flags_vartype {
        env_flags_vartype_decimal,
        env_flags_vartype_hex,
        env_flags_vartype_bool,
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
        env_flags_vartype_ipaddr,
        env_flags_vartype_macaddr,
 #endif
@@ -121,7 +121,7 @@ enum env_flags_varaccess env_flags_parse_varaccess(const char *flags);
  */
 enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags);
 
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
 /*
  * Check if a string has the format of an Ethernet MAC address
  */