From 755db95d1a36a4bd64519d7e05b00d62e848c458 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sun, 11 Nov 2018 01:42:17 +0100 Subject: (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 Reviewed-on: https://review.coreboot.org/c/29572 Tested-by: build bot (Jenkins) Reviewed-by: Julius Werner --- src/soc/qualcomm/ipq40xx/Makefile.inc | 6 +++--- src/soc/qualcomm/ipq40xx/uart.c | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'src/soc/qualcomm/ipq40xx') diff --git a/src/soc/qualcomm/ipq40xx/Makefile.inc b/src/soc/qualcomm/ipq40xx/Makefile.inc index d66a3d80e1..6447acf1d6 100644 --- a/src/soc/qualcomm/ipq40xx/Makefile.inc +++ b/src/soc/qualcomm/ipq40xx/Makefile.inc @@ -20,7 +20,7 @@ bootblock-y += cbmem.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 @@ -29,14 +29,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 += blsp.c diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c index fcca4ec526..491332b730 100644 --- a/src/soc/qualcomm/ipq40xx/uart.c +++ b/src/soc/qualcomm/ipq40xx/uart.c @@ -107,7 +107,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 */ @@ -116,7 +115,6 @@ static int valid_data = 0; /* Received data */ static unsigned int word = 0; - void uart_tx_byte(int idx, unsigned char data) { int num_of_chars = 1; @@ -135,7 +133,6 @@ void uart_tx_byte(int idx, unsigned char data) /* And now write the character(s) */ write32(MSM_BOOT_UART_DM_TF(base, 0), data); } -#endif /* CONFIG_SERIAL_UART */ /** * @brief msm_boot_uart_dm_reset - resets UART controller @@ -270,7 +267,6 @@ void uart_tx_flush(int idx) ; } -#if IS_ENABLED(CONFIG_DRIVERS_UART) /** * ipq40xx_serial_getc - reads a character * @@ -286,7 +282,6 @@ uint8_t uart_rx_byte(int idx) return byte; } -#endif #ifndef __PRE_RAM__ /* TODO: Implement function */ -- cgit v1.2.3