X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fenv_callback.h;h=48da32a67b6e1e9497c6e48315d4726dea7e8228;hb=90b658b4cc9f6b9d50a80fac1fbc62bd6420a483;hp=ab5d42dd8138be17f02ac4ad304127d55d16ea22;hpb=980267a1445b7b4d8e8d05ef57799d92ba4a2ee3;p=u-boot

diff --git a/include/env_callback.h b/include/env_callback.h
index ab5d42dd81..48da32a67b 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
@@ -43,7 +45,7 @@
 #define DNS_CALLBACK
 #endif
 
-#ifdef CONFIG_NET
+#ifdef CONFIG_CMD_NET
 #define NET_CALLBACKS \
 	"bootfile:bootfile," \
 	"ipaddr:ipaddr," \
@@ -53,7 +55,7 @@
 	"nvlan:nvlan," \
 	"vlan:vlan," \
 	DNS_CALLBACK \
-	"eth\\d?addr:ethaddr,"
+	"eth" ETHADDR_WILDCARD "addr:ethaddr,"
 #else
 #define NET_CALLBACKS
 #endif
@@ -70,6 +72,7 @@
 	SILENT_CALLBACK \
 	SPLASHIMAGE_CALLBACK \
 	"stdin:console,stdout:console,stderr:console," \
+	"serial#:serialno," \
 	CONFIG_ENV_CALLBACK_LIST_STATIC
 
 struct env_clbk_tbl {