(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>

1 files changed, 1 insertions, 6 deletions

diff --git a/src/soc/cavium/cn81xx/Makefile.inc b/src/soc/cavium/cn81xx/Makefile.inc
index ede7d73f71..3a36bfa6c0 100644
--- a/src/soc/cavium/cn81xx/Makefile.inc
+++ b/src/soc/cavium/cn81xx/Makefile.inc
@@ -25,9 +25,6 @@ bootblock-y += timer.c
 bootblock-y += spi.c
 bootblock-y += uart.c
 bootblock-y += cpu.c
-ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)
-bootblock-$(CONFIG_DRIVERS_UART) += uart.c
-endif
 
 ################################################################################
 # verstage
@@ -37,7 +34,7 @@ verstage-y += clock.c
 verstage-y += gpio.c
 verstage-y += timer.c
 verstage-y += spi.c
-verstage-$(CONFIG_DRIVERS_UART) += uart.c
+verstage-y += uart.c
 verstage-y += cbmem.c
 
 ################################################################################
@@ -49,7 +46,6 @@ romstage-y += gpio.c
 romstage-y += timer.c
 romstage-y += spi.c
 romstage-y += uart.c
-romstage-$(CONFIG_DRIVERS_UART) += uart.c
 romstage-y += cbmem.c
 
 romstage-y += sdram.c
@@ -64,7 +60,6 @@ ramstage-y += gpio.c
 ramstage-y += timer.c
 ramstage-y += spi.c
 ramstage-y += uart.c
-ramstage-$(CONFIG_DRIVERS_UART) += uart.c
 ramstage-y += sdram.c
 ramstage-y += soc.c
 ramstage-y += cpu.c