diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-08-30 23:02:10 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-08-30 23:02:10 +0200 |
| commit | 0fd30252c840ee54d2a80475d6504766d43b8add (patch) | |
| tree | 1ca4d91cd9ef225477cfc5aeeb9008f08ac587c2 /include | |
| parent | 2b75062a0f97ad6ff19d9d2c030d4b29829260f1 (diff) | |
| download | u-boot-imx-0fd30252c840ee54d2a80475d6504766d43b8add.zip u-boot-imx-0fd30252c840ee54d2a80475d6504766d43b8add.tar.gz u-boot-imx-0fd30252c840ee54d2a80475d6504766d43b8add.tar.bz2 | |
Make the serial driver framework work with CONFIG_SERIAL_MULTI enabled
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mcc200.h | 7 | ||||
| -rw-r--r-- | include/serial.h | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index fc5781e..61014ec 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -72,12 +72,15 @@ */ #if !defined(CONFIG_PRS200) /* MCC200 configuration: */ -#undef CONFIG_PSC_CONSOLE +#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) +#if defined(CONFIG_QUART_CONSOLE) && defined(CONFIG_PSC_CONSOLE) && \ + !defined(CONFIG_SERIAL_MULTI) #error "Select only one console device!" #endif #define CONFIG_BAUDRATE 115200 diff --git a/include/serial.h b/include/serial.h index 8c7b1c2..4880059 100644 --- a/include/serial.h +++ b/include/serial.h @@ -26,6 +26,13 @@ extern struct serial_device * default_serial_console (void); || defined(CONFIG_405EP) || defined(CONFIG_MPC5xxx) extern struct serial_device serial0_device; extern struct serial_device serial1_device; +#if defined(CFG_NS16550_SERIAL) +extern struct serial_device eserial1_device; +extern struct serial_device eserial2_device; +extern struct serial_device eserial3_device; +extern struct serial_device eserial4_device; +#endif /* CFG_NS16550_SERIAL */ + #endif |