summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/env_callback.h4
-rw-r--r--lib/Kconfig1
-rw-r--r--net/Kconfig1
3 files changed, 4 insertions, 2 deletions
diff --git a/include/env_callback.h b/include/env_callback.h
index ab5d42dd813..90b95b5e667 100644
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -33,8 +33,10 @@
#ifdef CONFIG_REGEX
#define ENV_DOT_ESCAPE "\\"
+#define ETHADDR_WILDCARD "\\d?"
#else
#define ENV_DOT_ESCAPE
+#define ETHADDR_WILDCARD
#endif
#ifdef CONFIG_CMD_DNS
@@ -53,7 +55,7 @@
"nvlan:nvlan," \
"vlan:vlan," \
DNS_CALLBACK \
- "eth\\d?addr:ethaddr,"
+ "eth" ETHADDR_WILDCARD "addr:ethaddr,"
#else
#define NET_CALLBACKS
#endif
diff --git a/lib/Kconfig b/lib/Kconfig
index 7ec8c98da2b..c98d3997b7d 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -38,6 +38,7 @@ config SYS_VSNPRINTF
config REGEX
bool "Enable regular expression support"
+ default y if NET
help
If this variable is defined, U-Boot is linked against the
SLRE (Super Light Regular Expression) library, which adds
diff --git a/net/Kconfig b/net/Kconfig
index 9a9846e1874..915371df912 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -4,7 +4,6 @@
menuconfig NET
bool "Networking support"
- select REGEX
if NET