projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
configs: sama5d2_ptc_ek: add onewire and eeprom drivers
[oweals/u-boot.git]
/
include
/
env_flags.h
diff --git
a/include/env_flags.h
b/include/env_flags.h
index 3ef631105f13ce40112bc90c1386043b15533120..cc2c34f939f152b6cf2f6dd70d02d1931eba9746 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
/*
* (C) Copyright 2012
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __ENV_FLAGS_H__
*/
#ifndef __ENV_FLAGS_H__
@@
-38,17
+37,31
@@
enum env_flags_varaccess {
#endif
#ifdef CONFIG_CMD_NET
#endif
#ifdef CONFIG_CMD_NET
+#ifdef CONFIG_REGEX
+#define ETHADDR_WILDCARD "\\d?"
+#else
+#define ETHADDR_WILDCARD
+#endif
#ifdef CONFIG_ENV_OVERWRITE
#ifdef CONFIG_ENV_OVERWRITE
-#define ETHADDR_FLAGS "ethaddr:ma,"
+#define ETHADDR_FLAGS "eth
" ETHADDR_WILDCARD "
addr:ma,"
#else
#ifdef CONFIG_OVERWRITE_ETHADDR_ONCE
#else
#ifdef CONFIG_OVERWRITE_ETHADDR_ONCE
-#define ETHADDR_FLAGS "ethaddr:mc,"
+#define ETHADDR_FLAGS "eth
" ETHADDR_WILDCARD "
addr:mc,"
#else
#else
-#define ETHADDR_FLAGS "ethaddr:mo,"
+#define ETHADDR_FLAGS "eth
" ETHADDR_WILDCARD "
addr:mo,"
#endif
#endif
#endif
#endif
+#define NET_FLAGS \
+ "ipaddr:i," \
+ "gatewayip:i," \
+ "netmask:i," \
+ "serverip:i," \
+ "nvlan:d," \
+ "vlan:d," \
+ "dnsip:i,"
#else
#else
-#define ETHADDR_FLAGS ""
+#define ETHADDR_FLAGS
+#define NET_FLAGS
#endif
#ifndef CONFIG_ENV_OVERWRITE
#endif
#ifndef CONFIG_ENV_OVERWRITE
@@
-59,6
+72,7
@@
enum env_flags_varaccess {
#define ENV_FLAGS_LIST_STATIC \
ETHADDR_FLAGS \
#define ENV_FLAGS_LIST_STATIC \
ETHADDR_FLAGS \
+ NET_FLAGS \
SERIAL_FLAGS \
CONFIG_ENV_FLAGS_LIST_STATIC
SERIAL_FLAGS \
CONFIG_ENV_FLAGS_LIST_STATIC
@@
-94,6
+108,13
@@
enum env_flags_varaccess env_flags_parse_varaccess(const char *flags);
*/
enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags);
*/
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.
#ifdef USE_HOSTCC
/*
* Look up the type of a variable directly from the .flags var.
@@
-121,7
+142,7
@@
int env_flags_validate_varaccess(const char *name, int check_mask);
/*
* Validate the parameters passed to "env set" for type compliance
*/
/*
* 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 */
#else /* !USE_HOSTCC */