diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-10 13:41:27 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-10 13:41:27 -0500 |
| commit | a1e6b529e57c622e862e93fa6da03d9504565089 (patch) | |
| tree | 1b756fb08296e17f4edec6f4dd40c7a6e2fb9a80 /env/flags.c | |
| parent | 8b301102e246350a0ccedc370f7c9923b02f86f2 (diff) | |
| parent | add396d66703c6c422353f950e584fae2a786a20 (diff) | |
Merge branch '2023-02-10-assorted-updates-and-additions'
- DM_SERIAL conversion for bcm7xxx, button input driver, qcom updates,
environment and network related cleanup, ftmac100 update, add a
IS_ENABLED conversion that was just missed.
Diffstat (limited to 'env/flags.c')
| -rw-r--r-- | env/flags.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/env/flags.c b/env/flags.c index e3e833c4333..e2866361dfe 100644 --- 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++) { |