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 ab5d42dd8138be17f02ac4ad304127d55d16ea22..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,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 +44,7 @@
 #define DNS_CALLBACK
 #endif
 
-#ifdef CONFIG_NET
+#ifdef CONFIG_CMD_NET
 #define NET_CALLBACKS \
        "bootfile:bootfile," \
        "ipaddr:ipaddr," \
@@ -53,7 +54,7 @@
        "nvlan:nvlan," \
        "vlan:vlan," \
        DNS_CALLBACK \
-       "eth\\d?addr:ethaddr,"
+       "eth" ETHADDR_WILDCARD "addr:ethaddr,"
 #else
 #define NET_CALLBACKS
 #endif
@@ -70,6 +71,7 @@
        SILENT_CALLBACK \
        SPLASHIMAGE_CALLBACK \
        "stdin:console,stdout:console,stderr:console," \
+       "serial#:serialno," \
        CONFIG_ENV_CALLBACK_LIST_STATIC
 
 struct env_clbk_tbl {