Skip to content

Commit

Permalink
env: Couple networking-related variable flags to CONFIG_NET
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
jan-kiszka authored and trini committed Feb 10, 2023
1 parent 5ab8105 commit 906bad3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions env/flags.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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++) {
Expand Down
4 changes: 2 additions & 2 deletions include/env_flags.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
*/
Expand Down

0 comments on commit 906bad3

Please sign in to comment.