Use a regular expression to apply the default formatting flags for all ethaddr env vars.
Signed-off-by: Joe Hershberger joe.hershberger@ni.com Reviewed-by: Simon Glass sjg@chromium.org ---
Changes in v2: -Added comments about the use of .flags in the dm eth test
include/env_flags.h | 11 ++++++++--- test/dm/eth.c | 3 +++ 2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/include/env_flags.h b/include/env_flags.h index 3ef6311..fc6d0d8 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -38,13 +38,18 @@ enum env_flags_varaccess { #endif
#ifdef CONFIG_CMD_NET +#ifdef CONFIG_REGEX +#define ETHADDR_WILDCARD "\d?" +#else +#define ETHADDR_WILDCARD +#endif #ifdef CONFIG_ENV_OVERWRITE -#define ETHADDR_FLAGS "ethaddr:ma," +#define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:ma," #else #ifdef CONFIG_OVERWRITE_ETHADDR_ONCE -#define ETHADDR_FLAGS "ethaddr:mc," +#define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mc," #else -#define ETHADDR_FLAGS "ethaddr:mo," +#define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mo," #endif #endif #else diff --git a/test/dm/eth.c b/test/dm/eth.c index 4891f3a..0c173b4 100644 --- a/test/dm/eth.c +++ b/test/dm/eth.c @@ -89,6 +89,8 @@ static int dm_test_eth_rotate(struct dm_test_state *dms) /* Invalidate eth1's MAC address */ net_ping_ip = string_to_ip("1.1.2.2"); strcpy(ethaddr, getenv("eth1addr")); + /* Must disable access protection for eth1addr before clearing */ + setenv(".flags", "eth1addr"); setenv("eth1addr", NULL);
/* Make sure that the default is to rotate to the next interface */ @@ -108,6 +110,7 @@ static int dm_test_eth_rotate(struct dm_test_state *dms)
/* Invalidate eth0's MAC address */ strcpy(ethaddr, getenv("ethaddr")); + /* Must disable access protection for ethaddr before clearing */ setenv(".flags", "ethaddr"); setenv("ethaddr", NULL);