Merge branch 'master' of git://www.denx.de/git/u-boot-mpc83xx

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

diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h
index 184338b97d271fa33b66c56aed9d073cc3043579..e558aa481b3d6f1adb43e49c841358f1ea6afb16 100644 (file)
--- a/include/configs/KUP4X.h
+++ b/include/configs/KUP4X.h
@@ -99,7 +99,15 @@
 
 #undef CONFIG_CAN_DRIVER               /* CAN Driver support disabled  */
 
-#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
+
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
@@ -167,12 +175,6 @@
 #define CONFIG_POST            (CFG_POST_CPU      | \
                                 CFG_POST_RTC      | \
                                 CFG_POST_I2C)
-
-#ifdef CONFIG_POST
-#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
-#else
-#define CFG_CMD_POST_DIAG 0
-#endif
 #endif
 
 
@@ -187,10 +189,12 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_NFS
-#define CONFIG_CMD_POST_DIAG
 #define CONFIG_CMD_SNTP
 #define CONFIG_CMD_USB
 
+#ifdef CONFIG_POST
+    #define CONFIG_CMD_DIAG
+#endif
 
 /*
  * Miscellaneous configurable options