Fix quoting problem (preboot setting) in many board config files.

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

diff --git a/include/configs/QS860T.h b/include/configs/QS860T.h
index 8d29a31..c980901 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 */
@@ -56,6 +55,7 @@
 #define CONFIG_QS860T          1       /* ...on a QS860T module */
 
 #define CONFIG_FEC_ENET                1       /* FEC 10/100BaseT ethernet */
+#define CONFIG_MII
 #define FEC_INTERRUPT          SIU_LEVEL1
 #undef CONFIG_SCC1_ENET                        /* SCC1 10BaseT ethernet */
 #define CFG_DISCOVER_PHY
@@ -72,14 +72,14 @@
 #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
 /* TODO compare against CADM860 */
 #define CONFIG_BOOTCOMMAND     "bootp; " \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) " \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; " \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} " \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download */
@@ -91,23 +91,33 @@
 
 #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
 
 #define CONFIG_RTC_MPC8xx      /* use internal RTC of MPC8xx */
 
-#define CONFIG_COMMANDS                ( CONFIG_CMD_DFL | \
-       CFG_CMD_REGINFO | \
-       CFG_CMD_IMMAP   | \
-       CFG_CMD_ASKENV  | \
-       CFG_CMD_NET     | \
-       CFG_CMD_DHCP    | \
-       CFG_CMD_DATE    )
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_REGINFO
+#define CONFIG_CMD_IMMAP
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_NET
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_DATE
 
 
 /* TODO */
@@ -135,7 +145,7 @@ CONFIG_SPI
 #define CFG_HUSH_PARSER                1               /* use "hush" command parser */
 #define CFG_PROMPT_HUSH_PS2    "> "
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CBSIZE             1024            /* Console I/O Buffer Size */
 #else
 #define CFG_CBSIZE             256             /* Console I/O Buffer Size */
@@ -209,7 +219,7 @@ CONFIG_SPI
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     16              /* For all MPC8xx CPUs */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT    4               /* log base 2 of the above value */
 #endif