serial: Remove CONFIG_SERIAL_MULTI from config files

[people/ms/u-boot.git] / include / configs / amcc-common.h

diff --git a/include/configs/amcc-common.h b/include/configs/amcc-common.h
index 13a941ef635c8c677a80f29f4fe3680c6a8a4f39..f2f522dce35c943e5d990c4c5240866315b40080 100644 (file)
--- a/include/configs/amcc-common.h
+++ b/include/configs/amcc-common.h
@@ -24,15 +24,18 @@
 #define __AMCC_COMMON_H
 
 #define CONFIG_SYS_SDRAM_BASE          0x00000000      /* _must_ be 0          */
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE       /* Start of U-Boot      */
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE    /* Start of U-Boot      */
 #define CONFIG_SYS_MONITOR_LEN         (0xFFFFFFFF - CONFIG_SYS_MONITOR_BASE + 1)
 #define CONFIG_SYS_MALLOC_LEN          (1 << 20)       /* Reserved for malloc  */
 
 /*
  * UART
  */
+#define CONFIG_SYS_NS16550
+#define CONFIG_SYS_NS16550_SERIAL
+#define CONFIG_SYS_NS16550_REG_SIZE    1
+#define CONFIG_SYS_NS16550_CLK         get_serial_clock()
 #define CONFIG_BAUDRATE                115200
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_SYS_BAUDRATE_TABLE  \
     {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
 
@@ -48,7 +51,6 @@
  */
 #define CONFIG_PPC4xx_EMAC
 #define CONFIG_MII                     /* MII PHY management           */
-#define CONFIG_NET_MULTI
 #define CONFIG_NETCONSOLE              /* include NetConsole support   */
 #if defined(CONFIG_440)
 #define CONFIG_SYS_RX_ETH_BUFFER       32      /* number of eth rx buffers     */
@@ -77,17 +79,6 @@
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_REGINFO
 
-#if defined(CONFIG_SYS_RAMBOOT)
-/*
- * Disable NOR FLASH commands on RAM-booting version. One main reason for this
- * RAM-booting version is boards with NAND and without NOR. This image can
- * be used for initial NAND programming.
- */
-#define CONFIG_SYS_NO_FLASH
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
-#endif
-
 /*
  * Miscellaneous configurable options
  */
@@ -120,9 +111,6 @@
 #define CONFIG_SYS_CONSOLE_INFO_QUIET          /* don't print console @ startup*/
 
 #define CONFIG_SYS_HUSH_PARSER                 /* Use the HUSH parser          */
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define        CONFIG_SYS_PROMPT_HUSH_PS2      "> "
-#endif
 
 #define CONFIG_LOADS_ECHO              /* echo on for serial download  */
 #define CONFIG_SYS_LOADS_BAUD_CHANGE           /* allow baudrate change        */
@@ -200,14 +188,11 @@
 #define CONFIG_ADDMISC "addmisc=setenv bootargs ${bootargs}\0"
 #endif
 
-#define xstr(s)        str(s)
-#define str(s) #s
-
 /*
  * General common environment variables shared on all AMCC eval boards
  */
 #define CONFIG_AMCC_DEF_ENV                                            \
-       "netdev=" xstr(CONFIG_USE_NETDEV) "\0"                          \
+       "netdev=" __stringify(CONFIG_USE_NETDEV) "\0"                           \
        "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
                "nfsroot=${serverip}:${rootpath}\0"                     \
        "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
@@ -215,15 +200,15 @@
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \
        "addtty=setenv bootargs ${bootargs}"                            \
-               " console=" xstr(CONFIG_USE_TTY) ",${baudrate}\0"       \
+               " console=" __stringify(CONFIG_USE_TTY) ",${baudrate}\0"        \
        CONFIG_ADDMISC                                                  \
        "initrd_high=30000000\0"                                        \
        "kernel_addr_r=1000000\0"                                       \
        "fdt_addr_r=1800000\0"                                          \
        "ramdisk_addr_r=1900000\0"                                      \
-       "hostname=" xstr(CONFIG_HOSTNAME) "\0"                          \
-       "bootfile=" xstr(CONFIG_HOSTNAME) "/uImage\0"                   \
-       "ramdisk_file=" xstr(CONFIG_HOSTNAME) "/uRamdisk\0"             \
+       "hostname=" __stringify(CONFIG_HOSTNAME) "\0"                           \
+       "bootfile=" __stringify(CONFIG_HOSTNAME) "/uImage\0"                    \
+       "ramdisk_file=" __stringify(CONFIG_HOSTNAME) "/uRamdisk\0"              \
        CONFIG_AMCC_DEF_ENV_ROOTPATH
 
 /*
@@ -245,7 +230,7 @@
        "net_self=run net_self_load;"                                   \
                "run ramargs addip addtty addmisc;"                     \
                "bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\0" \
-       "fdt_file=" xstr(CONFIG_HOSTNAME) "/" xstr(CONFIG_HOSTNAME) ".dtb\0"
+       "fdt_file=" __stringify(CONFIG_HOSTNAME) "/" __stringify(CONFIG_HOSTNAME) ".dtb\0"
 
 /*
  * Default environment for arch/ppc booting,
@@ -274,19 +259,17 @@
                "bootm ${kernel_addr_r}\0"
 
 #define CONFIG_AMCC_DEF_ENV_NOR_UPD                                    \
-       "u-boot=" xstr(CONFIG_HOSTNAME) "/u-boot.bin\0"                 \
+       "u-boot=" __stringify(CONFIG_HOSTNAME) "/u-boot.bin\0"          \
        "load=tftp 200000 ${u-boot}\0"                                  \
-       "update=protect off " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"        \
-               "era " xstr(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"               \
-               "cp.b ${fileaddr} " xstr(CONFIG_SYS_MONITOR_BASE) " ${filesize};" \
-               "setenv filesize;saveenv\0"                             \
+       "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;" \
+               "era " __stringify(CONFIG_SYS_MONITOR_BASE) " FFFFFFFF;"        \
+               "cp.b ${fileaddr} " __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0" \
        "upd=run load update\0"                                         \
 
 #define CONFIG_AMCC_DEF_ENV_NAND_UPD                                   \
-       "u-boot-nand=" xstr(CONFIG_HOSTNAME) "/u-boot-nand.bin\0"       \
+       "u-boot-nand=" __stringify(CONFIG_HOSTNAME) "/u-boot-nand.bin\0"\
        "nload=tftp 200000 ${u-boot-nand}\0"                            \
-       "nupdate=nand erase 0 100000;nand write 200000 0 100000;"       \
-               "setenv filesize;saveenv\0"                             \
+       "nupdate=nand erase 0 100000;nand write 200000 0 100000\0"      \
        "nupd=run nload nupdate\0"
 
 #endif /* __AMCC_COMMON_H */