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

[u-boot] / include / configs / sbc8560.h

diff --git a/include/configs/sbc8560.h b/include/configs/sbc8560.h
index d2199257f80bebe41549b30e72ccd6de1536ae47..46d60985d325e9750d29a00c069cf56144d71a5f 100644 (file)
--- a/include/configs/sbc8560.h
+++ b/include/configs/sbc8560.h
@@ -204,9 +204,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /* pass open firmware flat tree */
 #define CONFIG_OF_LIBFDT                1
@@ -260,8 +257,8 @@
      * - Select bus for bd/buffers
      * - Full duplex
      */
-    #define CONFIG_SYS_CMXFCR_MASK     (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
-    #define CONFIG_SYS_CMXFCR_VALUE    (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
+    #define CONFIG_SYS_CMXFCR_MASK2    (CMXFCR_FC2 | CMXFCR_RF2CS_MSK | CMXFCR_TF2CS_MSK)
+    #define CONFIG_SYS_CMXFCR_VALUE2   (CMXFCR_RF2CS_CLK13 | CMXFCR_TF2CS_CLK14)
     #define CONFIG_SYS_CPMFCR_RAMTYPE  0
     #define CONFIG_SYS_FCC_PSMR        (FCC_PSMR_FDE)
 
@@ -428,8 +425,8 @@
  */
 
 #define CONFIG_HOSTNAME                SBC8560
-#define CONFIG_ROOTPATH                /home/ppc
-#define CONFIG_BOOTFILE                uImage
+#define CONFIG_ROOTPATH                "/home/ppc"
+#define CONFIG_BOOTFILE                "uImage"
 
 #define        CONFIG_EXTRA_ENV_SETTINGS               \
        "netdev=eth0\0"                         \