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

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

diff --git a/include/configs/BAB7xx.h b/include/configs/BAB7xx.h
index 2569c9148313d1744dbdd76c03d40063d142a13d..c11e9c911d337fa10fe5c82437b7534707e97b76 100644 (file)
--- a/include/configs/BAB7xx.h
+++ b/include/configs/BAB7xx.h
@@ -66,7 +66,16 @@
 #define CONFIG_LOADS_ECHO       0       /* echo off for serial download */
 #define CFG_LOADS_BAUD_CHANGE           /* allow baudrate changes */
 
-#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
+
 
 /*
  * Command line configuration.
@@ -75,10 +84,10 @@
 
 #define CONFIG_CMD_PCI
 #define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_SCSI  
+#define CONFIG_CMD_SCSI
 #define CONFIG_CMD_IDE
-#define CONFIG_CMD_DATE 
-#define CONFIG_CMD_FDC   
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_FDC
 #define CONFIG_CMD_ELF