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

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

diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h
index 00b656e737dbe03ef9f69e2ce0d29c3b734a7c9d..5c2bfc991f5023ab5d462d5c0030faf27ef7f4be 100644 (file)
--- a/include/configs/BC3450.h
+++ b/include/configs/BC3450.h
@@ -138,14 +138,20 @@
                                 CFG_POST_I2C)
 
 #ifdef CONFIG_POST
-# define CFG_CMD_POST_DIAG CFG_CMD_DIAG
 /* preserve space for the post_word at end of on-chip SRAM */
 # define MPC5XXX_SRAM_POST_SIZE MPC5XXX_SRAM_SIZE-4
-#else
-# define CFG_CMD_POST_DIAG 0
 #endif /* CONFIG_POST */
 
 
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
 /*
  * Command line configuration.
  */
@@ -161,7 +167,6 @@
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_POST_DIAG
 #define CONFIG_CMD_REGINFO
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_BSP
@@ -187,11 +192,15 @@
 #ifdef CONFIG_BC3450_USB
     #define CONFIG_CMD_USB
 #endif
-                       
+
 #ifdef CONFIG_PCI
     #define CONFIG_CMD_PCI
 #endif
 
+#ifdef CONFIG_POST
+    #define CONFIG_CMD_DIAG
+#endif
+
 
 #define CONFIG_TIMESTAMP               /* display image timestamps */
 
@@ -449,8 +458,7 @@
 #endif
 
 /*
- * Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
- * which is normally part of the default commands (CFV_CMD_DFL)
+ * Enable loopw command.
  */
 #define CONFIG_LOOPW