hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c

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

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 58774ff..ca415e4 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -106,7 +106,6 @@
 #define CONFIG_PCI_IO_PHYS     CONFIG_PCI_IO_BUS
 #define CONFIG_PCI_IO_SIZE     0x01000000
 
-#define CONFIG_NET_MULTI       1
 #define CONFIG_EEPRO100                1
 #define CONFIG_SYS_RX_ETH_BUFFER       8  /* use 8 rx buffer on eepro100  */
 #define CONFIG_NS8382X         1
@@ -273,6 +272,11 @@
        "fdt_addr=FC100000\0"                                           \
        "kernel_addr=FC140000\0"                                        \
        "ramdisk_addr=FC600000\0"
+#elif defined(CONFIG_CHARON)
+#define ENV_FLASH_LAYOUT                                               \
+       "fdt_addr=FDFC0000\0"                                           \
+       "kernel_addr=FC0A0000\0"                                        \
+       "ramdisk_addr=FC200000\0"
 #else  /* !CONFIG_TQM5200_B */
 #define ENV_FLASH_LAYOUT                                               \
        "fdt_addr=FC0A0000\0"                                           \
@@ -426,7 +430,7 @@
 #define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define MTDIDS_DEFAULT         "nor0=fc000000.flash"
 
-#if defined(CONFIG_CHARON) || defined(CONFIG_STK52XX)
+#if defined(CONFIG_STK52XX)
 # if defined(CONFIG_TQM5200_B)
 #  if defined(CONFIG_SYS_LOWBOOT)
 #   define MTDPARTS_DEFAULT    "mtdparts=fc000000.flash:1m(firmware)," \
@@ -458,6 +462,13 @@
                                                "1792k(kernel),"        \
                                                "5632k(rootfs),"        \
                                                "24m(home)"
+#elif defined (CONFIG_CHARON)
+#   define MTDPARTS_DEFAULT    "mtdparts=fc000000.flash:640k(firmware),"\
+                                               "1408k(kernel),"        \
+                                               "2m(initrd),"           \
+                                               "4m(small-fs),"         \
+                                               "24320k(big-fs),"       \
+                                               "256k(dts)"
 #elif defined (CONFIG_FO300)
 #   define MTDPARTS_DEFAULT    "mtdparts=fc000000.flash:640k(firmware),"\
                                                "1408k(kernel),"        \
@@ -614,7 +625,6 @@
 
 #define CONFIG_CMDLINE_EDITING 1       /* add command line history     */
 #define        CONFIG_SYS_HUSH_PARSER          1       /* use "hush" command parser    */
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
 
 #define CONFIG_SYS_CACHELINE_SIZE      32      /* For MPC5xxx CPUs */
 #if defined(CONFIG_CMD_KGDB)