Merge branch 'for-1.3.2-ver2'

[platform/kernel/u-boot.git] / include / configs / CPCI750.h

diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h
index 000aaa5..48e29a2 100644 (file)
--- a/include/configs/CPCI750.h
+++ b/include/configs/CPCI750.h
@@ -133,8 +133,14 @@
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 #undef CONFIG_ALTIVEC                  /* undef to disable             */
 
-#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
 
 
 /*
@@ -142,18 +148,18 @@
  */
 #include <config_cmd_default.h>
 
-#define CONFIG_CMD_ASKENV 
-#define CONFIG_CMD_I2C   
-#define CONFIG_CMD_CACHE  
-#define CONFIG_CMD_EEPROM 
-#define CONFIG_CMD_PCI   
-#define CONFIG_CMD_ELF   
-#define CONFIG_CMD_DATE          
-#define CONFIG_CMD_NET   
-#define CONFIG_CMD_PING          
-#define CONFIG_CMD_IDE   
-#define CONFIG_CMD_FAT   
-#define CONFIG_CMD_EXT2          
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_CACHE
+#define CONFIG_CMD_EEPROM
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_DATE
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_IDE
+#define CONFIG_CMD_FAT
+#define CONFIG_CMD_EXT2
 
 
 #define CONFIG_DOS_PARTITION