Merge tag 'u-boot-at91-2022.07-a' of https://source.denx.de/u-boot/custodians/u-boot...

[platform/kernel/u-boot.git] / include / env_flags.h

diff --git a/include/env_flags.h b/include/env_flags.h
index 3ef6311..313cb8c 100644 (file)
--- a/include/env_flags.h
+++ b/include/env_flags.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_FLAGS_H__
@@ -25,6 +24,9 @@ enum env_flags_varaccess {
        env_flags_varaccess_readonly,
        env_flags_varaccess_writeonce,
        env_flags_varaccess_changedefault,
+#ifdef CONFIG_ENV_WRITEABLE_LIST
+       env_flags_varaccess_writeable,
+#endif
        env_flags_varaccess_end
 };
 
@@ -37,18 +39,32 @@ enum env_flags_varaccess {
 #define CONFIG_ENV_FLAGS_LIST_STATIC ""
 #endif
 
-#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_NET
+#ifdef CONFIG_REGEX
+#define ETHADDR_WILDCARD "\\d*"
+#else
+#define ETHADDR_WILDCARD
+#endif
 #ifdef CONFIG_ENV_OVERWRITE
-#define ETHADDR_FLAGS "ethaddr:ma,"
+#define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:ma,"
 #else
 #ifdef CONFIG_OVERWRITE_ETHADDR_ONCE
-#define ETHADDR_FLAGS "ethaddr:mc,"
+#define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mc,"
 #else
-#define ETHADDR_FLAGS "ethaddr:mo,"
+#define ETHADDR_FLAGS "eth" ETHADDR_WILDCARD "addr:mo,"
 #endif
 #endif
+#define NET_FLAGS \
+       "ipaddr:i," \
+       "gatewayip:i," \
+       "netmask:i," \
+       "serverip:i," \
+       "nvlan:d," \
+       "vlan:d," \
+       "dnsip:i,"
 #else
-#define ETHADDR_FLAGS ""
+#define ETHADDR_FLAGS
+#define NET_FLAGS
 #endif
 
 #ifndef CONFIG_ENV_OVERWRITE
@@ -59,6 +75,7 @@ enum env_flags_varaccess {
 
 #define ENV_FLAGS_LIST_STATIC \
        ETHADDR_FLAGS \
+       NET_FLAGS \
        SERIAL_FLAGS \
        CONFIG_ENV_FLAGS_LIST_STATIC
 
@@ -94,6 +111,13 @@ enum env_flags_varaccess env_flags_parse_varaccess(const char *flags);
  */
 enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags);
 
+#ifdef CONFIG_CMD_NET
+/*
+ * Check if a string has the format of an Ethernet MAC address
+ */
+int eth_validate_ethaddr_str(const char *addr);
+#endif
+
 #ifdef USE_HOSTCC
 /*
  * Look up the type of a variable directly from the .flags var.
@@ -121,23 +145,24 @@ int env_flags_validate_varaccess(const char *name, int check_mask);
 /*
  * Validate the parameters passed to "env set" for type compliance
  */
-int env_flags_validate_env_set_params(int argc, char * const argv[]);
+int env_flags_validate_env_set_params(char *name, char *const val[], int count);
 
 #else /* !USE_HOSTCC */
 
+#include <env.h>
 #include <search.h>
 
 /*
  * When adding a variable to the environment, initialize the flags for that
  * variable.
  */
-void env_flags_init(ENTRY *var_entry);
+void env_flags_init(struct env_entry *var_entry);
 
 /*
  * Validate the newval for to conform with the requirements defined by its flags
  */
-int env_flags_validate(const ENTRY *item, const char *newval, enum env_op op,
-       int flag);
+int env_flags_validate(const struct env_entry *item, const char *newval,
+                      enum env_op op, int flag);
 
 #endif /* USE_HOSTCC */
 
@@ -151,6 +176,7 @@ int env_flags_validate(const ENTRY *item, const char *newval, enum env_op op,
 #define ENV_FLAGS_VARACCESS_PREVENT_CREATE             0x00000010
 #define ENV_FLAGS_VARACCESS_PREVENT_OVERWR             0x00000020
 #define ENV_FLAGS_VARACCESS_PREVENT_NONDEF_OVERWR      0x00000040
-#define ENV_FLAGS_VARACCESS_BIN_MASK                   0x00000078
+#define ENV_FLAGS_VARACCESS_WRITEABLE                  0x00000080
+#define ENV_FLAGS_VARACCESS_BIN_MASK                   0x000000f8
 
 #endif /* __ENV_FLAGS_H__ */