Fix build errors and warnings / code cleanup.

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

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 612b661ad2209a0c40f14ba40ba3fe7f4ffad6e0..bfbf3a839cf7cbfe2b29c0b4f22017dd3e548367 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -132,9 +132,12 @@
 /*
  * BOOTP options
  */
-#define CONFIG_BOOTP_MASK                              ( CONFIG_BOOTP_DEFAULT          | \
-                                                                                 CONFIG_BOOTP_BOOTFILESIZE   \
-                                                                               )
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
 
 /*
  * The GEN860T network interface uses the on-chip 10/100 FEC with
@@ -222,12 +225,6 @@
                                                                CFG_POST_UART           | \
                                                                CFG_POST_SPR )
 
-#ifdef CONFIG_POST
-#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
-#else
-#define CFG_CMD_POST_DIAG              0
-#endif
-
 
 /*
  * Command line configuration.
@@ -245,12 +242,14 @@
 #define CONFIG_CMD_FPGA
 #define CONFIG_CMD_MII
 #define CONFIG_CMD_BEDBUG
-#define CONFIG_CMD_POST_DIAG
 
 #if !defined(CONFIG_SC)
     #define CONFIG_CMD_DOC
 #endif
 
+#ifdef CONFIG_POST
+#define CONFIG_CMD_DIAG
+#endif
 
 /*
  * There is no IDE/PCMCIA hardware support on the board.