fastboot: Change fastboot_buf_addr to an address

[u-boot.git] / include / env_callback.h

diff --git a/include/env_callback.h b/include/env_callback.h
index 90b95b5e6676087f00d234721c98c7e475cf4268..23bc650c162de4bd22813406ec1321dff3c204e7 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, [email protected]
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __ENV_CALLBACK_H__
@@ -15,8 +14,8 @@
 #define ENV_CALLBACK_VAR ".callbacks"
 
 /* Board configs can define additional static callback bindings */
-#ifndef CONFIG_ENV_CALLBACK_LIST_STATIC
-#define CONFIG_ENV_CALLBACK_LIST_STATIC
+#ifndef CFG_ENV_CALLBACK_LIST_STATIC
+#define CFG_ENV_CALLBACK_LIST_STATIC
 #endif
 
 #ifdef CONFIG_SILENT_CONSOLE
@@ -25,18 +24,10 @@
 #define SILENT_CALLBACK
 #endif
 
-#ifdef CONFIG_SPLASHIMAGE_GUARD
-#define SPLASHIMAGE_CALLBACK "splashimage:splashimage,"
-#else
-#define SPLASHIMAGE_CALLBACK
-#endif
-
 #ifdef CONFIG_REGEX
 #define ENV_DOT_ESCAPE "\\"
-#define ETHADDR_WILDCARD "\\d?"
 #else
 #define ENV_DOT_ESCAPE
-#define ETHADDR_WILDCARD
 #endif
 
 #ifdef CONFIG_CMD_DNS
@@ -60,6 +51,23 @@
 #define NET_CALLBACKS
 #endif
 
+#ifdef CONFIG_IPV6
+#define NET6_CALLBACKS \
+       "ip6addr:ip6addr," \
+       "serverip6:serverip6," \
+       "gatewayip6:gatewayip6,"
+#else
+#define NET6_CALLBACKS
+#endif
+
+#ifdef CONFIG_BOOTSTD_FULL
+#define BOOTSTD_CALLBACK \
+       "bootmeths:bootmeths," \
+       "bootargs:bootargs,"
+#else
+#define BOOTSTD_CALLBACK
+#endif
+
 /*
  * This list of callback bindings is static, but may be overridden by defining
  * a new association in the ".callbacks" environment variable.
@@ -68,35 +76,20 @@
        ENV_DOT_ESCAPE ENV_FLAGS_VAR ":flags," \
        "baudrate:baudrate," \
        NET_CALLBACKS \
+       NET6_CALLBACKS \
+       BOOTSTD_CALLBACK \
        "loadaddr:loadaddr," \
        SILENT_CALLBACK \
-       SPLASHIMAGE_CALLBACK \
        "stdin:console,stdout:console,stderr:console," \
-       CONFIG_ENV_CALLBACK_LIST_STATIC
-
-struct env_clbk_tbl {
-       const char *name;               /* Callback name */
-       int (*callback)(const char *name, const char *value, enum env_op op,
-               int flags);
-};
+       "serial#:serialno," \
+       CFG_ENV_CALLBACK_LIST_STATIC
 
-void env_callback_init(ENTRY *var_entry);
-
-/*
- * Define a callback that can be associated with variables.
- * when associated through the ".callbacks" environment variable, the callback
- * will be executed any time the variable is inserted, overwritten, or deleted.
- */
-#ifdef CONFIG_SPL_BUILD
-#define U_BOOT_ENV_CALLBACK(name, callback) \
-       static inline __maybe_unused void _u_boot_env_noop_##name(void) \
-       { \
-               (void)callback; \
-       }
+#ifndef CONFIG_SPL_BUILD
+void env_callback_init(struct env_entry *var_entry);
 #else
-#define U_BOOT_ENV_CALLBACK(name, callback) \
-       ll_entry_declare(struct env_clbk_tbl, name, env_clbk) = \
-       {#name, callback}
+static inline void env_callback_init(struct env_entry *var_entry)
+{
+}
 #endif
 
 #endif /* __ENV_CALLBACK_H__ */