projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI
[platform/kernel/u-boot.git]
/
include
/
env_flags.h
diff --git
a/include/env_flags.h
b/include/env_flags.h
index
9e87e1b
..
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
/*
* (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__
@@
-25,6
+24,9
@@
enum env_flags_varaccess {
env_flags_varaccess_readonly,
env_flags_varaccess_writeonce,
env_flags_varaccess_changedefault,
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
};
env_flags_varaccess_end
};
@@
-37,9
+39,9
@@
enum env_flags_varaccess {
#define CONFIG_ENV_FLAGS_LIST_STATIC ""
#endif
#define CONFIG_ENV_FLAGS_LIST_STATIC ""
#endif
-#ifdef CONFIG_
CMD_
NET
+#ifdef CONFIG_NET
#ifdef CONFIG_REGEX
#ifdef CONFIG_REGEX
-#define ETHADDR_WILDCARD "\\d
?
"
+#define ETHADDR_WILDCARD "\\d
*
"
#else
#define ETHADDR_WILDCARD
#endif
#else
#define ETHADDR_WILDCARD
#endif
@@
-57,8
+59,8
@@
enum env_flags_varaccess {
"gatewayip:i," \
"netmask:i," \
"serverip:i," \
"gatewayip:i," \
"netmask:i," \
"serverip:i," \
- "nvlan:
i
," \
- "vlan:
i
," \
+ "nvlan:
d
," \
+ "vlan:
d
," \
"dnsip:i,"
#else
#define ETHADDR_FLAGS
"dnsip:i,"
#else
#define ETHADDR_FLAGS
@@
-147,19
+149,20
@@
int env_flags_validate_env_set_params(char *name, char *const val[], int count);
#else /* !USE_HOSTCC */
#else /* !USE_HOSTCC */
+#include <env.h>
#include <search.h>
/*
* When adding a variable to the environment, initialize the flags for that
* variable.
*/
#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
*/
/*
* 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 */
#endif /* USE_HOSTCC */
@@
-173,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_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__ */
#endif /* __ENV_FLAGS_H__ */