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/rockchip/rk3399/Makefile.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/soc/rockchip/rk3399') diff --git a/src/soc/rockchip/rk3399/Makefile.inc b/src/soc/rockchip/rk3399/Makefile.inc index 83936e830f..854eb84eed 100644 --- a/src/soc/rockchip/rk3399/Makefile.inc +++ b/src/soc/rockchip/rk3399/Makefile.inc @@ -22,9 +22,7 @@ decompressor-y += timer.c bootblock-y += ../common/i2c.c bootblock-y += ../common/spi.c -ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) -bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c -endif +bootblock-y += ../common/uart.c bootblock-y += ../common/gpio.c bootblock-y += ../common/pwm.c bootblock-y += bootblock.c @@ -39,7 +37,7 @@ verstage-y += gpio.c verstage-y += sdram.c verstage-y += ../common/i2c.c verstage-y += ../common/spi.c -verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +verstage-y += ../common/uart.c verstage-y += clock.c verstage-y += timer.c @@ -48,7 +46,7 @@ verstage-y += timer.c romstage-y += ../common/cbmem.c romstage-y += sdram.c romstage-y += ../common/spi.c -romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +romstage-y += ../common/uart.c romstage-y += clock.c romstage-y += ../common/pwm.c romstage-y += timer.c @@ -64,7 +62,7 @@ romstage-y += ../common/i2c.c ramstage-y += ../common/cbmem.c ramstage-y += sdram.c ramstage-y += ../common/spi.c -ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +ramstage-y += ../common/uart.c ramstage-y += clock.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += display.c ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/edp.c -- cgit v1.2.3