X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fenv_callback.h;h=5c4a30c2deeed2fd810f6f7fbb6c7dfdd2aacde0;hb=0d7f1ae0fe6c0d9af2c0208aab4843ec3fdfaf52;hp=3de1093ff17889c342f9085eda8ff2d60abd2734;hpb=bdf1fe4e68b0d240f0ee666ea9d92d3f42f1a23f;p=u-boot

diff --git a/include/env_callback.h b/include/env_callback.h
index 3de1093ff1..5c4a30c2de 100644
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -33,8 +33,31 @@
 
 #ifdef CONFIG_REGEX
 #define ENV_DOT_ESCAPE "\\"
+#define ETHADDR_WILDCARD "\\d?"
 #else
 #define ENV_DOT_ESCAPE
+#define ETHADDR_WILDCARD
+#endif
+
+#ifdef CONFIG_CMD_DNS
+#define DNS_CALLBACK "dnsip:dnsip,"
+#else
+#define DNS_CALLBACK
+#endif
+
+#ifdef CONFIG_NET
+#define NET_CALLBACKS \
+	"bootfile:bootfile," \
+	"ipaddr:ipaddr," \
+	"gatewayip:gatewayip," \
+	"netmask:netmask," \
+	"serverip:serverip," \
+	"nvlan:nvlan," \
+	"vlan:vlan," \
+	DNS_CALLBACK \
+	"eth" ETHADDR_WILDCARD "addr:ethaddr,"
+#else
+#define NET_CALLBACKS
 #endif
 
 /*
@@ -44,11 +67,12 @@
 #define ENV_CALLBACK_LIST_STATIC ENV_DOT_ESCAPE ENV_CALLBACK_VAR ":callbacks," \
 	ENV_DOT_ESCAPE ENV_FLAGS_VAR ":flags," \
 	"baudrate:baudrate," \
-	"bootfile:bootfile," \
+	NET_CALLBACKS \
 	"loadaddr:loadaddr," \
 	SILENT_CALLBACK \
 	SPLASHIMAGE_CALLBACK \
 	"stdin:console,stdout:console,stderr:console," \
+	"serial#:serialno," \
 	CONFIG_ENV_CALLBACK_LIST_STATIC
 
 struct env_clbk_tbl {