There are two UARTs on MPC8569E-MDS boards, but UART1 can be muxed away to SD/MMC signals, so we'll need multi-serial support to support eSDHC on these boards (we'll redirect u-boot console to the second UART in case of enabled eSDHC).
Signed-off-by: Anton Vorontsov avorontsov@ru.mvista.com --- common/serial.c | 2 +- include/configs/MPC8569MDS.h | 1 + include/serial.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/serial.c b/common/serial.c index 09385d0..09974e7 100644 --- a/common/serial.c +++ b/common/serial.c @@ -40,7 +40,7 @@ struct serial_device *__default_serial_console (void) return &serial_scc_device; #elif defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) \ || defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) \ - || defined(CONFIG_MPC5xxx) + || defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC85xx) #if defined(CONFIG_CONS_INDEX) && defined(CONFIG_SYS_NS16550_SERIAL) #if (CONFIG_CONS_INDEX==1) return &eserial1_device; diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 0f50346..0956b06 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -206,6 +206,7 @@ extern unsigned long get_clock_freq(void);
/* Serial Port */ #define CONFIG_CONS_INDEX 1 +#define CONFIG_SERIAL_MULTI 1 #undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL diff --git a/include/serial.h b/include/serial.h index e3d8b36..7dc821e 100644 --- a/include/serial.h +++ b/include/serial.h @@ -24,7 +24,7 @@ extern struct serial_device * default_serial_console (void);
#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) || \ defined(CONFIG_405EP) || defined(CONFIG_405EZ) || defined(CONFIG_405EX) || \ - defined(CONFIG_MPC5xxx) + defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC85xx) extern struct serial_device serial0_device; extern struct serial_device serial1_device; #if defined(CONFIG_SYS_NS16550_SERIAL)