efi_loader: support device path for IDE and SCSI disks

[u-boot] / include / env_callback.h

diff --git a/include/env_callback.h b/include/env_callback.h
index 91f3cc013c5c02f569ed713d758cfd6bff67aca3..5c4a30c2deeed2fd810f6f7fbb6c7dfdd2aacde0 100644 (file)
--- 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
@@ -52,7 +54,8 @@
        "serverip:serverip," \
        "nvlan:nvlan," \
        "vlan:vlan," \
-       DNS_CALLBACK
+       DNS_CALLBACK \
+       "eth" ETHADDR_WILDCARD "addr:ethaddr,"
 #else
 #define NET_CALLBACKS
 #endif
@@ -69,6 +72,7 @@
        SILENT_CALLBACK \
        SPLASHIMAGE_CALLBACK \
        "stdin:console,stdout:console,stderr:console," \
+       "serial#:serialno," \
        CONFIG_ENV_CALLBACK_LIST_STATIC
 
 struct env_clbk_tbl {