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

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

diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h
index f49eb4b6ddb49df64810e215a36bba3390b4fd6f..1b948f6382a2cc6b4119544fda76d98c1b3ea906 100644 (file)
--- a/include/configs/CPCI405.h
+++ b/include/configs/CPCI405.h
@@ -60,10 +60,17 @@
 #define CONFIG_NET_MULTI       1
 #undef  CONFIG_HAS_ETH1
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | \
-                                CONFIG_BOOTP_DNS | \
-                                CONFIG_BOOTP_DNS2 | \
-                                CONFIG_BOOTP_SEND_HOSTNAME )
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_DNS
+#define CONFIG_BOOTP_DNS2
+#define CONFIG_BOOTP_SEND_HOSTNAME
+
 
 /*
  * Command line configuration.
@@ -85,8 +92,6 @@
 
 #define CONFIG_SUPPORT_VFAT
 
-#define CFG_NAND_LEGACY
-
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
 #define CONFIG_SDRAM_BANK0     1       /* init onboard SDRAM bank 0    */