diff options
| author | Joe Hershberger <joe.hershberger@ni.com> | 2015-05-20 19:27:22 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-05-21 13:13:20 (GMT) |
| commit | 73c2bbeea3d09bb8c81adc8769fc53493b6c0351 (patch) | |
| tree | e020d78e9a707bee28af09d3a009a382b7a6e132 | |
| parent | 94b467b14ed908c89a0780256e89b375aa3cf3ef (diff) | |
| download | u-boot-73c2bbeea3d09bb8c81adc8769fc53493b6c0351.tar.xz | |
net: Apply default format rules to all ethaddr
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>
| -rw-r--r-- | include/env_flags.h | 11 | ||||
| -rw-r--r-- | 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 196eba8..f31f6b3 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); |