Merge with git://www.denx.de/git/u-boot.git

[u-boot] / include / configs / gw8260.h

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index a8bc928b63b0e43a8e28bbdc12c1c983333f3981..ff5724082d03daee86fb6494773efb2de2317bb0 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -285,13 +285,16 @@
 #undef  CONFIG_AUTOBOOT_DELAY_STR
 #define DEBUG_BOOTKEYS      0
 
-/* Add support for a few extra bootp options like:
- *  - File size
- *  - DNS
+/*
+ * BOOTP options
  */
-#define CONFIG_BOOTP_MASK   (CONFIG_BOOTP_DEFAULT | \
-                            CONFIG_BOOTP_BOOTFILESIZE | \
-                            CONFIG_BOOTP_DNS)
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_DNS
 
 /* undef this to save memory */
 #define CFG_LONGHELP