rename CFG_ENV_IS_IN_NVRAM in CONFIG_ENV_IS_IN_NVRAM

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

diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index 906e117..9dfceef 100644 (file)
--- a/include/configs/QS860T.h
+++ b/include/configs/QS860T.h
@@ -38,7 +38,6 @@
 #undef CFG_DEVICE_NULLDEV              /* null device */
 #undef CONFIG_SILENT_CONSOLE           /* silent console */
 #undef CFG_CONSOLE_INFO_QUIET          /* silent console ? */
-#undef DEBUG                           /* debug output code */
 #undef DEBUG_FLASH                     /* debug flash code */
 #undef FLASH_DEBUG                     /* debug fash code */
 #undef DEBUG_ENV                       /* debug environment code */
@@ -73,7 +72,7 @@
 #undef CONFIG_CLOCKS_IN_MHZ            /* clocks passsed to Linux in MHz */
 
 #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
@@ -92,7 +91,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
@@ -125,7 +132,7 @@ CONFIG_SPI
 /*
  * Environment variable storage is in NVRAM
  */
-#define CFG_ENV_IS_IN_NVRAM    1
+#define CONFIG_ENV_IS_IN_NVRAM 1
 #define CFG_ENV_SIZE           0x00001000      /* We use only the last 4K for PPCBoot */
 #define CFG_ENV_ADDR           0xD100E000