summaryrefslogtreecommitdiffstats
path: root/include/configs/mcc200.h
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-14 23:39:52 +0200
committerTom Rini <trini@ti.com>2012-10-15 11:53:58 -0700
commitbffe31c144909722eb8b5878992fdf402cd42f9d (patch)
tree3dfad792472cfbf64b9d5105652b4b6d3d922f18 /include/configs/mcc200.h
parent82dda962f0a6449672df3378bb6b5fe54372a927 (diff)
downloadblackbird-obmc-uboot-bffe31c144909722eb8b5878992fdf402cd42f9d.tar.gz
blackbird-obmc-uboot-bffe31c144909722eb8b5878992fdf402cd42f9d.zip
serial: Remove CONFIG_SERIAL_MULTI from config files
Remove any notion of CONFIG_SERIAL_MULTI from board config files. Since CONFIG_SERIAL_MULTI is now enabled by default, it is useless to specify this config option in the board config files. Therefore remove it. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Marek Vasut <marek.vasut@gmail.com> Cc: Anatolij Gustschin <agust@denx.de> Cc: Stefan Roese <sr@denx.de> Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/mcc200.h')
-rw-r--r--include/configs/mcc200.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h
index d2bab457cc..5318c313a3 100644
--- a/include/configs/mcc200.h
+++ b/include/configs/mcc200.h
@@ -76,17 +76,12 @@
*/
#if !defined(CONFIG_PRS200)
/* MCC200 configuration: */
-#define CONFIG_SERIAL_MULTI 1
#define CONFIG_PSC_CONSOLE 1 /* PSC1 may be COM */
#define CONFIG_PSC_CONSOLE2 2 /* PSC2 is PSoC */
#else
/* PRS200 configuration: */
#define CONFIG_PSC_CONSOLE 1 /* console is on PSC1 */
#endif
-#if defined(CONFIG_QUART_CONSOLE) && defined(CONFIG_PSC_CONSOLE) && \
- !defined(CONFIG_SERIAL_MULTI)
-#error "Select only one console device!"
-#endif
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
OpenPOWER on IntegriCloud