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

[oweals/u-boot.git] / include / configs / IVML24.h

diff --git a/include/configs/IVML24.h b/include/configs/IVML24.h
index 313f8d8b2d1d7292560d7608a9b8d7ac32fdb88f..1142f2afac14b337f71058661ab987445722444b 100644 (file)
--- a/include/configs/IVML24.h
+++ b/include/configs/IVML24.h
@@ -84,8 +84,14 @@
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
 
-#define CONFIG_BOOTP_MASK \
-    ((CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE) & ~CONFIG_BOOTP_GATEWAY)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
 
 /*
  * Miscellaneous configurable options