diff options
| author | Gabe Black <gabeblack@chromium.org> | 2011-08-12 00:35:07 -0700 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2011-08-29 10:59:36 -0700 |
| commit | 29af2cb46e630a5c41555e97b4e8e154de1e8145 (patch) | |
| tree | d7fb20f1a8cd6c153abe444f4bfe2a9a9b87d0e5 /common/serial.c | |
| parent | 87d29940c710751191b82c18a49a79b490c03749 (diff) | |
Remove explicit support for the OXPCIE952
Early in development, we needed a driver for the OXPCIE952 UART which would be
left configured by coreboot and just needed to send and receive characters. It
was only partially developed and was somewhat redundant with the NS16550 UART
support already in u-boot. Now that we're using the device tree to configure
the serial console and it requires us to use the NS16550 driver, the OXPCIE952
driver is no longer necessary. Since it isn't likely to be useful in other
contexts, this change removes support for it entirely.
BUG=chrome-os-partner:4520
TEST=Built on x86-alex and tegra2_kaen. Installed and booted on x86-alex and
verified that the serial console still worked.
Change-Id: I124c4596b224f1b2a8d27b2b38e08ee2ce739c79
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: http://gerrit.chromium.org/gerrit/5871
Reviewed-by: Simon Glass <sjg@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
Diffstat (limited to 'common/serial.c')
| -rw-r--r-- | common/serial.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/common/serial.c b/common/serial.c index 82c87cba21..a69ac4d212 100644 --- a/common/serial.c +++ b/common/serial.c @@ -48,9 +48,7 @@ struct serial_device *__default_serial_console (void) || defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) \ || defined(CONFIG_MPC86xx) || defined(CONFIG_SYS_SC520) \ || defined(CONFIG_TEGRA2) || defined(CONFIG_SYS_COREBOOT) -#if defined(CONFIG_SYS_COREBOOT) && defined(CONFIG_SYS_OXPCIE952) - return &oxpcie952_device; -#elif defined(CONFIG_CONS_INDEX) && defined(CONFIG_SYS_NS16550_SERIAL) +#if defined(CONFIG_CONS_INDEX) && defined(CONFIG_SYS_NS16550_SERIAL) #if (CONFIG_CONS_INDEX==1) return &eserial1_device; #elif (CONFIG_CONS_INDEX==2) @@ -149,9 +147,6 @@ void serial_initialize (void) serial_register(&eserial4_device); #endif #endif /* CONFIG_SYS_NS16550_SERIAL */ -#if defined(CONFIG_SYS_OXPCIE952) - serial_register(&oxpcie952_device); -#endif #if defined (CONFIG_FFUART) serial_register(&serial_ffuart_device); #endif |