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

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

diff --git a/include/configs/ep7312.h b/include/configs/ep7312.h
index 12be15102f5354a0c9a27aa9893ae81b82c2d0f4..f5cf477a31356437e40b13c70c8e078237e051dc 100644 (file)
--- a/include/configs/ep7312.h
+++ b/include/configs/ep7312.h
@@ -62,7 +62,14 @@
 
 #define CONFIG_BAUDRATE                9600
 
-#define CONFIG_BOOTP_MASK       (CONFIG_BOOTP_DEFAULT|CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
 
 
 /*