Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h
index 3dc7a8e..8a82702 100644 (file)
--- a/include/configs/lwmon.h
+++ b/include/configs/lwmon.h
@@ -170,12 +170,6 @@
 
 #define CONFIG_RTC_PCF8563             /* use Philips PCF8563 RTC      */
 
-#ifdef CONFIG_POST
-#define CFG_CMD_POST_DIAG CFG_CMD_DIAG
-#else
-#define CFG_CMD_POST_DIAG 0
-#endif
-
 
 /*
  * Command line configuration.
@@ -192,14 +186,24 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_IDE
 #define CONFIG_CMD_NFS
-#define CONFIG_CMD_POST
 #define CONFIG_CMD_SNTP
 
+#ifdef CONFIG_POST
+#define CONFIG_CMD_DIAG
+#endif
+
 
 #define CONFIG_MAC_PARTITION
 #define CONFIG_DOS_PARTITION
 
-#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
 
 
 /*