diff options
| author | Marek Vasut <marex@denx.de> | 2012-09-14 23:44:09 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-15 11:53:58 -0700 |
| commit | a3827250606895ec2dd4b8d867342b7cabf3692f (patch) | |
| tree | 6b12200d510d6f07ce49ef3e90642b09142e60f4 /drivers/serial/serial_pxa.c | |
| parent | bffe31c144909722eb8b5878992fdf402cd42f9d (diff) | |
| download | talos-obmc-uboot-a3827250606895ec2dd4b8d867342b7cabf3692f.tar.gz talos-obmc-uboot-a3827250606895ec2dd4b8d867342b7cabf3692f.zip | |
serial: Remove CONFIG_SERIAL_MULTI from serial drivers
Remove the support for not-CONFIG_SERIAL_MULTI part from serial
port drivers and some board files. Since CONFIG_SERIAL_MULTI is
now enabled by default, that part is a dead code. 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 'drivers/serial/serial_pxa.c')
| -rw-r--r-- | drivers/serial/serial_pxa.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/serial/serial_pxa.c b/drivers/serial/serial_pxa.c index 46d76894e6..ad391004b9 100644 --- a/drivers/serial/serial_pxa.c +++ b/drivers/serial/serial_pxa.c @@ -73,20 +73,6 @@ DECLARE_GLOBAL_DATA_PTR; #define HWUART_INDEX 0xff #endif -#ifndef CONFIG_SERIAL_MULTI -#if defined(CONFIG_FFUART) -#define UART_INDEX FFUART_INDEX -#elif defined(CONFIG_BTUART) -#define UART_INDEX BTUART_INDEX -#elif defined(CONFIG_STUART) -#define UART_INDEX STUART_INDEX -#elif defined(CONFIG_HWUART) -#define UART_INDEX HWUART_INDEX -#else -#error "Please select CONFIG_(FF|BT|ST|HW)UART in board config file." -#endif -#endif - static uint32_t pxa_uart_get_baud_divider(void) { if (gd->baudrate == 1200) @@ -297,9 +283,6 @@ void pxa_puts_dev(unsigned int uart_index, const char *s) pxa_uart_multi(btuart, BTUART) #endif -#ifndef CONFIG_SERIAL_MULTI - pxa_uart(serial, UART) -#else __weak struct serial_device *default_serial_console(void) { #if CONFIG_CONS_INDEX == 1 @@ -327,4 +310,3 @@ void pxa_serial_initialize(void) serial_register(&serial_stuart_device); #endif } -#endif |
