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/mediatek/mt8173/Makefile.inc | 10 ++++------ src/soc/mediatek/mt8183/Makefile.inc | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) (limited to 'src/soc/mediatek') diff --git a/src/soc/mediatek/mt8173/Makefile.inc b/src/soc/mediatek/mt8173/Makefile.inc index b2a5ebdd33..b004c27d8f 100644 --- a/src/soc/mediatek/mt8173/Makefile.inc +++ b/src/soc/mediatek/mt8173/Makefile.inc @@ -23,9 +23,7 @@ bootblock-y += ../common/spi.c spi.c bootblock-y += ../common/timer.c bootblock-y += timer.c -ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) -bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c -endif +bootblock-y += ../common/uart.c bootblock-y += ../common/gpio.c gpio.c gpio_init.c bootblock-y += ../common/pmic_wrap.c pmic_wrap.c mt6391.c @@ -37,7 +35,7 @@ bootblock-y += ../common/mmu_operations.c mmu_operations.c verstage-y += i2c.c verstage-y += ../common/spi.c spi.c -verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +verstage-y += ../common/uart.c verstage-y += ../common/timer.c verstage-y += timer.c @@ -53,7 +51,7 @@ romstage-y += ../common/timer.c romstage-y += timer.c romstage-y += i2c.c -romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +romstage-y += ../common/uart.c romstage-y += ../common/cbmem.c romstage-y += ../common/gpio.c gpio.c romstage-y += ../common/spi.c spi.c @@ -72,7 +70,7 @@ ramstage-$(CONFIG_SPI_FLASH) += flash_controller.c ramstage-y += soc.c ../common/mtcmos.c ramstage-y += ../common/timer.c ramstage-y += timer.c -ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +ramstage-y += ../common/uart.c ramstage-y += ../common/pmic_wrap.c pmic_wrap.c mt6391.c i2c.c ramstage-y += mt6311.c ramstage-y += da9212.c diff --git a/src/soc/mediatek/mt8183/Makefile.inc b/src/soc/mediatek/mt8183/Makefile.inc index bd81258fba..9fff52f6c7 100644 --- a/src/soc/mediatek/mt8183/Makefile.inc +++ b/src/soc/mediatek/mt8183/Makefile.inc @@ -6,9 +6,7 @@ bootblock-y += ../common/gpio.c gpio.c bootblock-y += ../common/pll.c pll.c bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c bootblock-y += ../common/timer.c -ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) -bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c -endif +bootblock-y += ../common/uart.c bootblock-y += ../common/wdt.c decompressor-y += decompressor.c @@ -19,7 +17,7 @@ verstage-y += auxadc.c verstage-y += ../common/gpio.c gpio.c verstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c verstage-y += ../common/timer.c -verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +verstage-y += ../common/uart.c verstage-y += ../common/wdt.c romstage-y += auxadc.c @@ -32,7 +30,7 @@ romstage-y += ../common/gpio.c gpio.c romstage-y += ../common/mmu_operations.c mmu_operations.c romstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c romstage-y += ../common/timer.c -romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +romstage-y += ../common/uart.c romstage-y += ../common/wdt.c ramstage-y += auxadc.c @@ -43,7 +41,7 @@ ramstage-y += ../common/mtcmos.c mtcmos.c ramstage-y += soc.c ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c ramstage-y += ../common/timer.c -ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c +ramstage-y += ../common/uart.c ramstage-y += ../common/usb.c ramstage-y += ../common/wdt.c -- cgit v1.2.3