ARM: keystone2: Cleanup PLL init code

[karo-tx-uboot.git] / include / env_flags.h

diff --git a/include/env_flags.h b/include/env_flags.h
index 3ef631105f13ce40112bc90c1386043b15533120..2d2de88fc04fdd187caf5dd32799a56b6ac3ede0 100644 (file)
--- a/include/env_flags.h
+++ b/include/env_flags.h
@@ -38,17 +38,31 @@ enum env_flags_varaccess {
 #endif
 
 #ifdef CONFIG_CMD_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:i," \
+       "vlan:i," \
+       "dnsip:i,"
 #else
-#define ETHADDR_FLAGS ""
+#define ETHADDR_FLAGS
+#define NET_FLAGS
 #endif
 
 #ifndef CONFIG_ENV_OVERWRITE
@@ -59,6 +73,7 @@ enum env_flags_varaccess {
 
 #define ENV_FLAGS_LIST_STATIC \
        ETHADDR_FLAGS \
+       NET_FLAGS \
        SERIAL_FLAGS \
        CONFIG_ENV_FLAGS_LIST_STATIC