diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-11-11 01:42:17 +0100 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2018-11-21 22:49:48 +0000 |
| commit | 755db95d1a36a4bd64519d7e05b00d62e848c458 (patch) | |
| tree | 301582945323865890ae28e54ab8725592690618 /src/soc/qualcomm/ipq806x | |
| parent | 7470c902d80d04730ac1147336339cc057db1be9 (diff) | |
(console,drivers/uart)/Kconfig: Fix dependencies
The dependencies of CONSOLE_SERIAL and DRIVERS_UART were somehow
backwards. Fix that. Now, CONSOLE_SERIAL depends on DRIVERS_UART,
because it's using its interface. The individual UART drivers
select DRIVERS_UART, because they implement the interface and
depend on the common UART code.
Some guards had to be fixed (using CONSOLE_SERIAL now instead of
DRIVERS_UART). Some other guards that were only about compilation
of units were removed. We want to build test as much as possible,
right?
Change-Id: I0ea73a8909f07202b23c88db93df74cf9dc8abf9
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/29572
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'src/soc/qualcomm/ipq806x')
| -rw-r--r-- | src/soc/qualcomm/ipq806x/Makefile.inc | 6 | ||||
| -rw-r--r-- | src/soc/qualcomm/ipq806x/uart.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc index b14db038e5..8a428b2f0d 100644 --- a/src/soc/qualcomm/ipq806x/Makefile.inc +++ b/src/soc/qualcomm/ipq806x/Makefile.inc @@ -19,7 +19,7 @@ bootblock-y += clock.c bootblock-y += gpio.c bootblock-$(CONFIG_SPI_FLASH) += spi.c bootblock-y += timer.c -bootblock-$(CONFIG_DRIVERS_UART) += uart.c +bootblock-y += uart.c verstage-y += clock.c verstage-y += gpio.c @@ -28,14 +28,14 @@ verstage-y += i2c.c verstage-y += qup.c verstage-y += spi.c verstage-y += timer.c -verstage-$(CONFIG_DRIVERS_UART) += uart.c +verstage-y += uart.c romstage-y += clock.c romstage-y += blobs_init.c romstage-y += gpio.c romstage-$(CONFIG_SPI_FLASH) += spi.c romstage-y += timer.c -romstage-$(CONFIG_DRIVERS_UART) += uart.c +romstage-y += uart.c romstage-y += cbmem.c romstage-y += i2c.c romstage-y += gsbi.c diff --git a/src/soc/qualcomm/ipq806x/uart.c b/src/soc/qualcomm/ipq806x/uart.c index 3af7958aa2..3805c87f46 100644 --- a/src/soc/qualcomm/ipq806x/uart.c +++ b/src/soc/qualcomm/ipq806x/uart.c @@ -109,7 +109,6 @@ static unsigned int msm_boot_uart_dm_init_rx_transfer(void *uart_dm_base) return MSM_BOOT_UART_DM_E_SUCCESS; } -#if IS_ENABLED(CONFIG_DRIVERS_UART) static unsigned int msm_boot_uart_dm_init(void *uart_dm_base); /* Received data is valid or not */ @@ -212,7 +211,6 @@ void uart_tx_byte(int idx, unsigned char data) /* And now write the character(s) */ write32(MSM_BOOT_UART_DM_TF(base, 0), tx_data); } -#endif /* CONFIG_SERIAL_UART */ /* * msm_boot_uart_dm_reset - resets UART controller @@ -380,7 +378,6 @@ int uart_can_rx_byte(void) } #endif -#if IS_ENABLED(CONFIG_DRIVERS_UART) /** * ipq806x_serial_getc - reads a character * @@ -401,7 +398,6 @@ uint8_t uart_rx_byte(int idx) return byte; } -#endif #ifndef __PRE_RAM__ /* TODO: Implement fuction */ |