Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/armadillo.h b/include/configs/armadillo.h
index 7c77fa731159593040bd1f77ed3f8c2746ae4e08..73a88854b38fb06a6cab85dc42f01a0ff86cafeb 100644 (file)
--- a/include/configs/armadillo.h
+++ b/include/configs/armadillo.h
@@ -71,7 +71,14 @@
 
 #define CONFIG_BAUDRATE                115200
 
-#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
 
 
 /*