Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / include / env_flags.h

diff --git a/include/env_flags.h b/include/env_flags.h
index 8823fb9602eaa78fdffc161004b003bfc65bff4d..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
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __ENV_FLAGS_H__
@@ -57,8 +56,8 @@ enum env_flags_varaccess {
        "gatewayip:i," \
        "netmask:i," \
        "serverip:i," \
-       "nvlan:i," \
-       "vlan:i," \
+       "nvlan:d," \
+       "vlan:d," \
        "dnsip:i,"
 #else
 #define ETHADDR_FLAGS
@@ -143,7 +142,7 @@ 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 */