diff options
| author | Tom Rini <[email protected]> | 2021-07-07 22:50:41 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-07-07 22:50:41 -0400 |
| commit | bfb5bfa3c58adc2ef5dbd1bb95b79b31e0dc221c (patch) | |
| tree | 21753c7f94144a286584c1f631ad9bde89a1a438 /drivers/serial | |
| parent | 7e58a3a148fb94e9ce09fb48d0ddd75c20ee7df9 (diff) | |
| parent | 123dc510c6e79f0c94718e2e6b5e4074754aa629 (diff) | |
Merge branch '2021-07-07-remove-non-migrated-platforms'
- Remove a large number of platforms that did not migrate to DM_PCI or
DM_USB by 2 years past the migration deadline and do not have a
migration imminent.
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/serial/Makefile | 1 | ||||
| -rw-r--r-- | drivers/serial/serial_pl01x.c | 4 |
3 files changed, 2 insertions, 11 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 9f82467c4e3..961e3fb0314 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -332,7 +332,7 @@ config DEBUG_UART_APBUART config DEBUG_UART_PL010 bool "pl010" - depends on PL01X_SERIAL || PL010_SERIAL + depends on PL01X_SERIAL help Select this to enable a debug UART using the pl01x driver with the PL010 UART type. You will need to provide parameters to make this @@ -695,12 +695,6 @@ config INTEL_MID_SERIAL Select this to enable a UART for Intel MID platforms. This uses the ns16550 driver as a library. -config PL010_SERIAL - bool "ARM PL010 driver" - depends on !DM_SERIAL - help - Select this to enable a UART for platforms using PL010. - config PL011_SERIAL bool "ARM PL011 driver" depends on !DM_SERIAL diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 6c0fdca5861..3cbea8156f8 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -24,7 +24,6 @@ endif ifdef CONFIG_DM_SERIAL obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o else -obj-$(CONFIG_PL010_SERIAL) += serial_pl01x.o obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o obj-$(CONFIG_SYS_NS16550_SERIAL) += serial_ns16550.o endif diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 5283d5ed118..76b96ad414c 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -191,9 +191,7 @@ static void pl01x_serial_init_baud(int baudrate) { int clock = 0; -#if defined(CONFIG_PL010_SERIAL) - pl01x_type = TYPE_PL010; -#elif defined(CONFIG_PL011_SERIAL) +#if defined(CONFIG_PL011_SERIAL) pl01x_type = TYPE_PL011; clock = CONFIG_PL011_CLOCK; #endif |