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

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

diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h
index ce25aa5..3879d9b 100644 (file)
--- a/include/configs/CPU87.h
+++ b/include/configs/CPU87.h
@@ -114,7 +114,7 @@
 
 #define CONFIG_PREBOOT                                                         \
        "echo; "                                                                \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS; "       \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS; "   \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -165,7 +165,14 @@
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
 #undef CFG_LOADS_BAUD_CHANGE           /* don't allow baudrate change  */
 
-#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
 
 
 /*