Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / include / env_callback.h

diff --git a/include/env_callback.h b/include/env_callback.h
index 3de1093ff17889c342f9085eda8ff2d60abd2734..3c44ff574b0d4276459629580efed9c525c746e1 100644 (file)
--- a/include/env_callback.h
+++ b/include/env_callback.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2012
  * Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __ENV_CALLBACK_H__
@@ -33,8 +32,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_CMD_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 +66,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 {