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/broadcom/cygnus/Makefile.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/soc/broadcom') diff --git a/src/soc/broadcom/cygnus/Makefile.inc b/src/soc/broadcom/cygnus/Makefile.inc index cfbaaa71a3..21c580619f 100644 --- a/src/soc/broadcom/cygnus/Makefile.inc +++ b/src/soc/broadcom/cygnus/Makefile.inc @@ -23,13 +23,13 @@ bootblock-y += tz.c bootblock-y += hw_init.c bootblock-$(CONFIG_SPI_FLASH) += spi.c ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) -bootblock-$(CONFIG_DRIVERS_UART) += ns16550.c +bootblock-y += ns16550.c endif verstage-y += i2c.c verstage-y += timer.c verstage-$(CONFIG_SPI_FLASH) += spi.c -verstage-$(CONFIG_DRIVERS_UART) += ns16550.c +verstage-y += ns16550.c romstage-y += cbmem.c romstage-y += i2c.c @@ -37,7 +37,7 @@ romstage-y += timer.c romstage-y += romstage.c romstage-y += sdram.c romstage-$(CONFIG_SPI_FLASH) += spi.c -romstage-$(CONFIG_DRIVERS_UART) += ns16550.c +romstage-y += ns16550.c romstage-y += ddr_init.c romstage-y += ddr_init_table.c romstage-y += shmoo_and28.c @@ -53,7 +53,7 @@ ramstage-y += sdram.c ramstage-y += soc.c ramstage-y += timer.c ramstage-$(CONFIG_SPI_FLASH) += spi.c -ramstage-$(CONFIG_DRIVERS_UART) += ns16550.c +ramstage-y += ns16550.c ramstage-y += usb.c CPPFLAGS_common += -Isrc/soc/broadcom/cygnus/include/ -- cgit v1.2.3