<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/29572">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">(console,drivers/uart)/Kconfig: Fix dependencies<br><br>The dependencies of CONSOLE_SERIAL and DRIVERS_UART were somehow<br>backwards. Fix that. Now, CONSOLE_SERIAL depends on DRIVERS_UART,<br>because it's using its interface. The individual UART drivers<br>select DRIVERS_UART, because they implement the interface and<br>depend on the common UART code.<br><br>Some guards had to be fixed (using CONSOLE_SERIAL now instead of<br>DRIVERS_UART). Some other guards that were only about compilation<br>of units were removed. We want to build test as much as possible,<br>right?<br><br>Change-Id: I0ea73a8909f07202b23c88db93df74cf9dc8abf9<br>Signed-off-by: Nico Huber <nico.h@gmx.de><br>---<br>M src/console/Kconfig<br>M src/cpu/allwinner/a10/Makefile.inc<br>M src/cpu/ti/am335x/Makefile.inc<br>M src/drivers/uart/Kconfig<br>M src/mainboard/google/gru/bootblock.c<br>M src/mainboard/google/veyron/bootblock.c<br>M src/mainboard/google/veyron_mickey/bootblock.c<br>M src/mainboard/google/veyron_rialto/bootblock.c<br>M src/soc/broadcom/cygnus/Makefile.inc<br>M src/soc/imgtec/pistachio/Makefile.inc<br>M src/soc/mediatek/mt8173/Makefile.inc<br>M src/soc/mediatek/mt8183/Makefile.inc<br>M src/soc/nvidia/tegra124/Makefile.inc<br>M src/soc/nvidia/tegra210/Makefile.inc<br>M src/soc/qualcomm/ipq40xx/Makefile.inc<br>M src/soc/qualcomm/ipq40xx/uart.c<br>M src/soc/qualcomm/ipq806x/Makefile.inc<br>M src/soc/qualcomm/ipq806x/uart.c<br>M src/soc/qualcomm/sdm845/Kconfig<br>M src/soc/qualcomm/sdm845/Makefile.inc<br>M src/soc/rockchip/rk3288/Makefile.inc<br>M src/soc/rockchip/rk3399/Makefile.inc<br>M src/soc/samsung/exynos5250/Makefile.inc<br>23 files changed, 59 insertions(+), 89 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/72/29572/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/console/Kconfig b/src/console/Kconfig</span><br><span>index 318ca18..e7e3298 100644</span><br><span>--- a/src/console/Kconfig</span><br><span>+++ b/src/console/Kconfig</span><br><span>@@ -29,7 +29,7 @@</span><br><span> config CONSOLE_SERIAL</span><br><span>    bool "Serial port console output"</span><br><span>  default y</span><br><span style="color: hsl(0, 100%, 40%);">-       depends on DRIVERS_UART_8250IO || DRIVERS_UART_8250MEM || HAVE_UART_SPECIAL</span><br><span style="color: hsl(120, 100%, 40%);">+   depends on DRIVERS_UART</span><br><span>      help</span><br><span>           Send coreboot debug output to a serial port.</span><br><span> </span><br><span>diff --git a/src/cpu/allwinner/a10/Makefile.inc b/src/cpu/allwinner/a10/Makefile.inc</span><br><span>index 152d765..a6cd4b4 100644</span><br><span>--- a/src/cpu/allwinner/a10/Makefile.inc</span><br><span>+++ b/src/cpu/allwinner/a10/Makefile.inc</span><br><span>@@ -21,11 +21,9 @@</span><br><span> ramstage-y      += timer.c</span><br><span> ramstage-y        += twi.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_DRIVERS_UART),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c uart_console.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y  += uart.c uart_console.c</span><br><span> romstage-y  += uart.c uart_console.c</span><br><span> ramstage-y  += uart.c uart_console.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span> </span><br><span> real-target: $(obj)/BOOT0</span><br><span> </span><br><span>diff --git a/src/cpu/ti/am335x/Makefile.inc b/src/cpu/ti/am335x/Makefile.inc</span><br><span>index 5b91981..24a79dd 100644</span><br><span>--- a/src/cpu/ti/am335x/Makefile.inc</span><br><span>+++ b/src/cpu/ti/am335x/Makefile.inc</span><br><span>@@ -12,11 +12,9 @@</span><br><span> ramstage-y      += nand.c</span><br><span> ramstage-y += cbmem.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_DRIVERS_UART),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y       += uart.c</span><br><span> romstage-y += uart.c</span><br><span> ramstage-y += uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span> </span><br><span> $(call add-class,omap-header)</span><br><span> $(eval $(call create_class_compiler,omap-header,arm))</span><br><span>diff --git a/src/drivers/uart/Kconfig b/src/drivers/uart/Kconfig</span><br><span>index 1130aeb..1f23a19 100644</span><br><span>--- a/src/drivers/uart/Kconfig</span><br><span>+++ b/src/drivers/uart/Kconfig</span><br><span>@@ -1,7 +1,5 @@</span><br><span> config DRIVERS_UART</span><br><span>   bool</span><br><span style="color: hsl(0, 100%, 40%);">-    default y if CONSOLE_SERIAL</span><br><span style="color: hsl(0, 100%, 40%);">-     default n</span><br><span> </span><br><span> config DRIVERS_UART_8250IO</span><br><span>  # FIXME: Shouldn't have a prompt, should default to n, and</span><br><span>@@ -11,6 +9,7 @@</span><br><span>    default n if DRIVERS_UART_8250MEM || HAVE_UART_SPECIAL</span><br><span>       default n if NO_UART_ON_SUPERIO</span><br><span>      default y</span><br><span style="color: hsl(120, 100%, 40%);">+     select DRIVERS_UART</span><br><span> </span><br><span> config DRIVERS_UART_8250IO_SKIP_INIT</span><br><span>      def_bool n</span><br><span>@@ -37,6 +36,7 @@</span><br><span> config DRIVERS_UART_8250MEM</span><br><span>        bool</span><br><span>         default n</span><br><span style="color: hsl(120, 100%, 40%);">+     select DRIVERS_UART</span><br><span> </span><br><span> config DRIVERS_UART_8250MEM_32</span><br><span>    bool</span><br><span>@@ -46,6 +46,7 @@</span><br><span> config HAVE_UART_SPECIAL</span><br><span>         bool</span><br><span>         default n</span><br><span style="color: hsl(120, 100%, 40%);">+     select DRIVERS_UART</span><br><span> </span><br><span> config DRIVERS_UART_OXPCIE</span><br><span>        bool "Oxford OXPCIe952"</span><br><span>diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c</span><br><span>index 0013414..b2f7d57 100644</span><br><span>--- a/src/mainboard/google/gru/bootblock.c</span><br><span>+++ b/src/mainboard/google/gru/bootblock.c</span><br><span>@@ -49,16 +49,16 @@</span><br><span>         if (!IS_ENABLED(CONFIG_GRU_BASEBOARD_SCARLET))</span><br><span>               gpio_output(GPIO_P15V_EN, 1);   /* Scarlet: EC-controlled */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_DRIVERS_UART)</span><br><span style="color: hsl(0, 100%, 40%);">-     _Static_assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE,</span><br><span style="color: hsl(0, 100%, 40%);">-                       "CONSOLE_SERIAL_UART should be UART2");</span><br><span style="color: hsl(120, 100%, 40%);">+      if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {</span><br><span style="color: hsl(120, 100%, 40%);">+              _Static_assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE,</span><br><span style="color: hsl(120, 100%, 40%);">+                             "CONSOLE_SERIAL_UART should be UART2");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /* iomux: select gpio4c[4:3] as uart2 dbg port */</span><br><span style="color: hsl(0, 100%, 40%);">-       write32(&rk3399_grf->iomux_uart2c, IOMUX_UART2C);</span><br><span style="color: hsl(120, 100%, 40%);">+              /* iomux: select gpio4c[4:3] as uart2 dbg port */</span><br><span style="color: hsl(120, 100%, 40%);">+             write32(&rk3399_grf->iomux_uart2c, IOMUX_UART2C);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    /* grf soc_con7[11:10] use for uart2 select */</span><br><span style="color: hsl(0, 100%, 40%);">-  write32(&rk3399_grf->soc_con7, UART2C_SEL);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(120, 100%, 40%);">+              /* grf soc_con7[11:10] use for uart2 select */</span><br><span style="color: hsl(120, 100%, 40%);">+                write32(&rk3399_grf->soc_con7, UART2C_SEL);</span><br><span style="color: hsl(120, 100%, 40%);">+    }</span><br><span> }</span><br><span> </span><br><span> static void configure_spi_flash(void)</span><br><span>diff --git a/src/mainboard/google/veyron/bootblock.c b/src/mainboard/google/veyron/bootblock.c</span><br><span>index 5126ce5..8648a3c 100644</span><br><span>--- a/src/mainboard/google/veyron/bootblock.c</span><br><span>+++ b/src/mainboard/google/veyron/bootblock.c</span><br><span>@@ -31,11 +31,10 @@</span><br><span> </span><br><span> void bootblock_mainboard_early_init()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-    if (IS_ENABLED(CONFIG_DRIVERS_UART)) {</span><br><span style="color: hsl(120, 100%, 40%);">+        if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {</span><br><span>             assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);</span><br><span>            write32(&rk3288_grf->iomux_uart2, IOMUX_UART2);</span><br><span>       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> }</span><br><span> </span><br><span> void bootblock_mainboard_init(void)</span><br><span>diff --git a/src/mainboard/google/veyron_mickey/bootblock.c b/src/mainboard/google/veyron_mickey/bootblock.c</span><br><span>index 1110a0b..28f6b14 100644</span><br><span>--- a/src/mainboard/google/veyron_mickey/bootblock.c</span><br><span>+++ b/src/mainboard/google/veyron_mickey/bootblock.c</span><br><span>@@ -31,11 +31,10 @@</span><br><span> </span><br><span> void bootblock_mainboard_early_init()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  if (IS_ENABLED(CONFIG_DRIVERS_UART)) {</span><br><span style="color: hsl(120, 100%, 40%);">+        if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {</span><br><span>             assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);</span><br><span>            write32(&rk3288_grf->iomux_uart2, IOMUX_UART2);</span><br><span>       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> }</span><br><span> </span><br><span> void bootblock_mainboard_init(void)</span><br><span>diff --git a/src/mainboard/google/veyron_rialto/bootblock.c b/src/mainboard/google/veyron_rialto/bootblock.c</span><br><span>index 1ba01fb..626d987 100644</span><br><span>--- a/src/mainboard/google/veyron_rialto/bootblock.c</span><br><span>+++ b/src/mainboard/google/veyron_rialto/bootblock.c</span><br><span>@@ -31,11 +31,10 @@</span><br><span> </span><br><span> void bootblock_mainboard_early_init()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-  if (IS_ENABLED(CONFIG_DRIVERS_UART)) {</span><br><span style="color: hsl(120, 100%, 40%);">+        if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {</span><br><span>             assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);</span><br><span>            write32(&rk3288_grf->iomux_uart2, IOMUX_UART2);</span><br><span>       }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> }</span><br><span> </span><br><span> void bootblock_mainboard_init(void)</span><br><span>diff --git a/src/soc/broadcom/cygnus/Makefile.inc b/src/soc/broadcom/cygnus/Makefile.inc</span><br><span>index cfbaaa7..21c5806 100644</span><br><span>--- a/src/soc/broadcom/cygnus/Makefile.inc</span><br><span>+++ b/src/soc/broadcom/cygnus/Makefile.inc</span><br><span>@@ -23,13 +23,13 @@</span><br><span> bootblock-y += hw_init.c</span><br><span> bootblock-$(CONFIG_SPI_FLASH) += spi.c</span><br><span> ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += ns16550.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += ns16550.c</span><br><span> endif</span><br><span> </span><br><span> verstage-y += i2c.c</span><br><span> verstage-y += timer.c</span><br><span> verstage-$(CONFIG_SPI_FLASH) += spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += ns16550.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += ns16550.c</span><br><span> </span><br><span> romstage-y += cbmem.c</span><br><span> romstage-y += i2c.c</span><br><span>@@ -37,7 +37,7 @@</span><br><span> romstage-y += romstage.c</span><br><span> romstage-y += sdram.c</span><br><span> romstage-$(CONFIG_SPI_FLASH) += spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += ns16550.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += ns16550.c</span><br><span> romstage-y += ddr_init.c</span><br><span> romstage-y += ddr_init_table.c</span><br><span> romstage-y += shmoo_and28.c</span><br><span>@@ -53,7 +53,7 @@</span><br><span> ramstage-y += soc.c</span><br><span> ramstage-y += timer.c</span><br><span> ramstage-$(CONFIG_SPI_FLASH) += spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_DRIVERS_UART) += ns16550.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += ns16550.c</span><br><span> ramstage-y += usb.c</span><br><span> </span><br><span> CPPFLAGS_common += -Isrc/soc/broadcom/cygnus/include/</span><br><span>diff --git a/src/soc/imgtec/pistachio/Makefile.inc b/src/soc/imgtec/pistachio/Makefile.inc</span><br><span>index 78e7789..6e8d539 100644</span><br><span>--- a/src/soc/imgtec/pistachio/Makefile.inc</span><br><span>+++ b/src/soc/imgtec/pistachio/Makefile.inc</span><br><span>@@ -22,11 +22,9 @@</span><br><span> romstage-y += spi.c</span><br><span> ramstage-y += spi.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_DRIVERS_UART),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += uart.c</span><br><span> romstage-y += uart.c</span><br><span> ramstage-y += uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span> </span><br><span> bootblock-y += monotonic_timer.c</span><br><span> </span><br><span>diff --git a/src/soc/mediatek/mt8173/Makefile.inc b/src/soc/mediatek/mt8173/Makefile.inc</span><br><span>index e125e03..9c7acf9 100644</span><br><span>--- a/src/soc/mediatek/mt8173/Makefile.inc</span><br><span>+++ b/src/soc/mediatek/mt8173/Makefile.inc</span><br><span>@@ -23,9 +23,7 @@</span><br><span> bootblock-y += ../common/timer.c</span><br><span> bootblock-y += timer.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += ../common/uart.c</span><br><span> </span><br><span> bootblock-y += ../common/gpio.c gpio.c gpio_init.c pmic_wrap.c mt6391.c</span><br><span> bootblock-y += ../common/wdt.c</span><br><span>@@ -36,7 +34,7 @@</span><br><span> verstage-y += i2c.c</span><br><span> verstage-y += ../common/spi.c spi.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += ../common/uart.c</span><br><span> </span><br><span> verstage-y += ../common/timer.c</span><br><span> verstage-y += timer.c</span><br><span>@@ -52,7 +50,7 @@</span><br><span> romstage-y += timer.c</span><br><span> romstage-y += i2c.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += ../common/uart.c</span><br><span> romstage-y += ../common/cbmem.c</span><br><span> romstage-y += ../common/gpio.c gpio.c</span><br><span> romstage-y += ../common/spi.c spi.c</span><br><span>@@ -71,7 +69,7 @@</span><br><span> ramstage-y += soc.c ../common/mtcmos.c</span><br><span> ramstage-y += ../common/timer.c</span><br><span> ramstage-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += ../common/uart.c</span><br><span> ramstage-y += pmic_wrap.c mt6391.c i2c.c</span><br><span> ramstage-y += mt6311.c</span><br><span> ramstage-y += da9212.c</span><br><span>diff --git a/src/soc/mediatek/mt8183/Makefile.inc b/src/soc/mediatek/mt8183/Makefile.inc</span><br><span>index bd81258..9fff52f 100644</span><br><span>--- a/src/soc/mediatek/mt8183/Makefile.inc</span><br><span>+++ b/src/soc/mediatek/mt8183/Makefile.inc</span><br><span>@@ -6,9 +6,7 @@</span><br><span> bootblock-y += ../common/pll.c pll.c</span><br><span> bootblock-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c</span><br><span> bootblock-y += ../common/timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += ../common/uart.c</span><br><span> bootblock-y += ../common/wdt.c</span><br><span> </span><br><span> decompressor-y += decompressor.c</span><br><span>@@ -19,7 +17,7 @@</span><br><span> verstage-y += ../common/gpio.c gpio.c</span><br><span> verstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c</span><br><span> verstage-y += ../common/timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += ../common/uart.c</span><br><span> verstage-y += ../common/wdt.c</span><br><span> </span><br><span> romstage-y += auxadc.c</span><br><span>@@ -32,7 +30,7 @@</span><br><span> romstage-y += ../common/mmu_operations.c mmu_operations.c</span><br><span> romstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c</span><br><span> romstage-y += ../common/timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += ../common/uart.c</span><br><span> romstage-y += ../common/wdt.c</span><br><span> </span><br><span> ramstage-y += auxadc.c</span><br><span>@@ -43,7 +41,7 @@</span><br><span> ramstage-y += soc.c</span><br><span> ramstage-$(CONFIG_SPI_FLASH) += ../common/spi.c spi.c</span><br><span> ramstage-y += ../common/timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += ../common/uart.c</span><br><span> ramstage-y += ../common/usb.c</span><br><span> ramstage-y += ../common/wdt.c</span><br><span> </span><br><span>diff --git a/src/soc/nvidia/tegra124/Makefile.inc b/src/soc/nvidia/tegra124/Makefile.inc</span><br><span>index 2f0f470..fb5389f 100644</span><br><span>--- a/src/soc/nvidia/tegra124/Makefile.inc</span><br><span>+++ b/src/soc/nvidia/tegra124/Makefile.inc</span><br><span>@@ -16,15 +16,13 @@</span><br><span> bootblock-y += ../tegra/pingroup.c</span><br><span> bootblock-y += ../tegra/pinmux.c</span><br><span> bootblock-y += ../tegra/apbmisc.c</span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += uart.c</span><br><span> </span><br><span> verstage-y += verstage.c</span><br><span> verstage-y += dma.c</span><br><span> verstage-y += monotonic_timer.c</span><br><span> verstage-y += spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += uart.c</span><br><span> verstage-y += ../tegra/gpio.c</span><br><span> verstage-y += ../tegra/i2c.c</span><br><span> verstage-y += ../tegra/pinmux.c</span><br><span>@@ -46,7 +44,7 @@</span><br><span> romstage-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c</span><br><span> romstage-y += ../tegra/pinmux.c</span><br><span> romstage-y += cache.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += uart.c</span><br><span> </span><br><span> ramstage-y += cbmem.c</span><br><span> ramstage-y += clock.c</span><br><span>@@ -65,7 +63,7 @@</span><br><span> ramstage-$(CONFIG_SOFTWARE_I2C) += ../tegra/software_i2c.c</span><br><span> ramstage-y += ../tegra/pinmux.c</span><br><span> ramstage-y += ../tegra/usb.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += uart.c</span><br><span> </span><br><span> rmodules_$(ARCH-romstage-y)-y += monotonic_timer.c</span><br><span> </span><br><span>diff --git a/src/soc/nvidia/tegra210/Makefile.inc b/src/soc/nvidia/tegra210/Makefile.inc</span><br><span>index a2b50c9..e213751 100644</span><br><span>--- a/src/soc/nvidia/tegra210/Makefile.inc</span><br><span>+++ b/src/soc/nvidia/tegra210/Makefile.inc</span><br><span>@@ -18,16 +18,14 @@</span><br><span> bootblock-y += ../tegra/pinmux.c</span><br><span> bootblock-y += ../tegra/apbmisc.c</span><br><span> bootblock-y += ../tegra/usb.c</span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += uart.c</span><br><span> </span><br><span> verstage-y += dma.c</span><br><span> verstage-y += monotonic_timer.c</span><br><span> verstage-y += spi.c</span><br><span> verstage-y += padconfig.c</span><br><span> verstage-y += funitcfg.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += uart.c</span><br><span> verstage-y += ../tegra/gpio.c</span><br><span> verstage-y += ../tegra/i2c.c</span><br><span> verstage-y += ../tegra/pinmux.c</span><br><span>@@ -57,7 +55,7 @@</span><br><span> romstage-y += ../tegra/i2c.c</span><br><span> romstage-y += ../tegra/pinmux.c</span><br><span> romstage-y += ../tegra/usb.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += uart.c</span><br><span> </span><br><span> ramstage-y += addressmap.c</span><br><span> ramstage-y += cbmem.c</span><br><span>@@ -92,7 +90,7 @@</span><br><span> ramstage-y += ../tegra/pinmux.c</span><br><span> ramstage-y += ramstage.c</span><br><span> ramstage-y += mmu_operations.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += uart.c</span><br><span> ramstage-y += ../tegra/usb.c</span><br><span> ramstage-$(CONFIG_HAVE_MTC) += mtc.c</span><br><span> ramstage-y += stage_entry.S</span><br><span>diff --git a/src/soc/qualcomm/ipq40xx/Makefile.inc b/src/soc/qualcomm/ipq40xx/Makefile.inc</span><br><span>index d66a3d8..6447acf 100644</span><br><span>--- a/src/soc/qualcomm/ipq40xx/Makefile.inc</span><br><span>+++ b/src/soc/qualcomm/ipq40xx/Makefile.inc</span><br><span>@@ -20,7 +20,7 @@</span><br><span> bootblock-y += gpio.c</span><br><span> bootblock-$(CONFIG_SPI_FLASH) += spi.c</span><br><span> bootblock-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += uart.c</span><br><span> </span><br><span> verstage-y += clock.c</span><br><span> verstage-y += gpio.c</span><br><span>@@ -29,14 +29,14 @@</span><br><span> verstage-y += qup.c</span><br><span> verstage-y += spi.c</span><br><span> verstage-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += uart.c</span><br><span> </span><br><span> romstage-y += clock.c</span><br><span> romstage-y += blobs_init.c</span><br><span> romstage-y += gpio.c</span><br><span> romstage-$(CONFIG_SPI_FLASH) += spi.c</span><br><span> romstage-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += uart.c</span><br><span> romstage-y += cbmem.c</span><br><span> romstage-y += i2c.c</span><br><span> romstage-y += blsp.c</span><br><span>diff --git a/src/soc/qualcomm/ipq40xx/uart.c b/src/soc/qualcomm/ipq40xx/uart.c</span><br><span>index 4b0bffd..d819c1c 100644</span><br><span>--- a/src/soc/qualcomm/ipq40xx/uart.c</span><br><span>+++ b/src/soc/qualcomm/ipq40xx/uart.c</span><br><span>@@ -108,7 +108,6 @@</span><br><span>        return MSM_BOOT_UART_DM_E_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_DRIVERS_UART)</span><br><span> static unsigned int msm_boot_uart_dm_init(void  *uart_dm_base);</span><br><span> </span><br><span> /* Received data is valid or not */</span><br><span>@@ -117,7 +116,6 @@</span><br><span> /* Received data */</span><br><span> static unsigned int word = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> void uart_tx_byte(int idx, unsigned char data)</span><br><span> {</span><br><span>        int num_of_chars = 1;</span><br><span>@@ -136,7 +134,6 @@</span><br><span>  /* And now write the character(s) */</span><br><span>         write32(MSM_BOOT_UART_DM_TF(base, 0), data);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* CONFIG_SERIAL_UART */</span><br><span> </span><br><span> /**</span><br><span>  * @brief msm_boot_uart_dm_reset - resets UART controller</span><br><span>@@ -271,7 +268,6 @@</span><br><span>               ;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_DRIVERS_UART)</span><br><span> /**</span><br><span>  * ipq40xx_serial_getc - reads a character</span><br><span>  *</span><br><span>@@ -287,7 +283,6 @@</span><br><span> </span><br><span>   return byte;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> #ifndef __PRE_RAM__</span><br><span> /* TODO: Implement function */</span><br><span>diff --git a/src/soc/qualcomm/ipq806x/Makefile.inc b/src/soc/qualcomm/ipq806x/Makefile.inc</span><br><span>index b14db03..8a428b2 100644</span><br><span>--- a/src/soc/qualcomm/ipq806x/Makefile.inc</span><br><span>+++ b/src/soc/qualcomm/ipq806x/Makefile.inc</span><br><span>@@ -19,7 +19,7 @@</span><br><span> bootblock-y += gpio.c</span><br><span> bootblock-$(CONFIG_SPI_FLASH) += spi.c</span><br><span> bootblock-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += uart.c</span><br><span> </span><br><span> verstage-y += clock.c</span><br><span> verstage-y += gpio.c</span><br><span>@@ -28,14 +28,14 @@</span><br><span> verstage-y += qup.c</span><br><span> verstage-y += spi.c</span><br><span> verstage-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += uart.c</span><br><span> </span><br><span> romstage-y += clock.c</span><br><span> romstage-y += blobs_init.c</span><br><span> romstage-y += gpio.c</span><br><span> romstage-$(CONFIG_SPI_FLASH) += spi.c</span><br><span> romstage-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += uart.c</span><br><span> romstage-y += cbmem.c</span><br><span> romstage-y += i2c.c</span><br><span> romstage-y += gsbi.c</span><br><span>diff --git a/src/soc/qualcomm/ipq806x/uart.c b/src/soc/qualcomm/ipq806x/uart.c</span><br><span>index 3af7958..3805c87 100644</span><br><span>--- a/src/soc/qualcomm/ipq806x/uart.c</span><br><span>+++ b/src/soc/qualcomm/ipq806x/uart.c</span><br><span>@@ -109,7 +109,6 @@</span><br><span>  return MSM_BOOT_UART_DM_E_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_DRIVERS_UART)</span><br><span> static unsigned int msm_boot_uart_dm_init(void  *uart_dm_base);</span><br><span> </span><br><span> /* Received data is valid or not */</span><br><span>@@ -212,7 +211,6 @@</span><br><span>   /* And now write the character(s) */</span><br><span>         write32(MSM_BOOT_UART_DM_TF(base, 0), tx_data);</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif /* CONFIG_SERIAL_UART */</span><br><span> </span><br><span> /*</span><br><span>  * msm_boot_uart_dm_reset - resets UART controller</span><br><span>@@ -380,7 +378,6 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#if IS_ENABLED(CONFIG_DRIVERS_UART)</span><br><span> /**</span><br><span>  * ipq806x_serial_getc - reads a character</span><br><span>  *</span><br><span>@@ -401,7 +398,6 @@</span><br><span> </span><br><span>         return byte;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> </span><br><span> #ifndef __PRE_RAM__</span><br><span> /* TODO: Implement fuction */</span><br><span>diff --git a/src/soc/qualcomm/sdm845/Kconfig b/src/soc/qualcomm/sdm845/Kconfig</span><br><span>index 6399ad1..c5d8009 100644</span><br><span>--- a/src/soc/qualcomm/sdm845/Kconfig</span><br><span>+++ b/src/soc/qualcomm/sdm845/Kconfig</span><br><span>@@ -11,6 +11,7 @@</span><br><span>     select GENERIC_UDELAY</span><br><span>        select HAVE_MONOTONIC_TIMER</span><br><span>  select ARM64_USE_ARCH_TIMER</span><br><span style="color: hsl(120, 100%, 40%);">+   select HAVE_UART_SPECIAL</span><br><span> </span><br><span> if SOC_QUALCOMM_SDM845</span><br><span> </span><br><span>diff --git a/src/soc/qualcomm/sdm845/Makefile.inc b/src/soc/qualcomm/sdm845/Makefile.inc</span><br><span>index e603177..507d913 100644</span><br><span>--- a/src/soc/qualcomm/sdm845/Makefile.inc</span><br><span>+++ b/src/soc/qualcomm/sdm845/Makefile.inc</span><br><span>@@ -7,7 +7,7 @@</span><br><span> bootblock-y += mmu.c</span><br><span> bootblock-y += timer.c</span><br><span> bootblock-y += gpio.c</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += uart_bitbang.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += uart_bitbang.c</span><br><span> </span><br><span> ################################################################################</span><br><span> verstage-y += spi.c</span><br><span>diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc</span><br><span>index 100c00e..7e4c5b4 100644</span><br><span>--- a/src/soc/rockchip/rk3288/Makefile.inc</span><br><span>+++ b/src/soc/rockchip/rk3288/Makefile.inc</span><br><span>@@ -19,9 +19,7 @@</span><br><span> </span><br><span> bootblock-y += bootblock.c</span><br><span> bootblock-y += ../common/cbmem.c</span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += ../common/uart.c</span><br><span> bootblock-y += timer.c</span><br><span> bootblock-y += clock.c</span><br><span> bootblock-y += ../common/spi.c</span><br><span>@@ -33,7 +31,7 @@</span><br><span> </span><br><span> verstage-y += ../common/spi.c</span><br><span> verstage-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += ../common/uart.c</span><br><span> verstage-y += ../common/gpio.c</span><br><span> verstage-y += gpio.c</span><br><span> verstage-y += clock.c</span><br><span>@@ -43,7 +41,7 @@</span><br><span> </span><br><span> romstage-y += ../common/cbmem.c</span><br><span> romstage-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += ../common/uart.c</span><br><span> romstage-y += ../common/i2c.c</span><br><span> romstage-$(CONFIG_SOFTWARE_I2C) += software_i2c.c</span><br><span> romstage-y += clock.c</span><br><span>@@ -72,7 +70,7 @@</span><br><span> ramstage-y += ../common/edp.c</span><br><span> ramstage-y += hdmi.c</span><br><span> ramstage-y += display.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += ../common/uart.c</span><br><span> </span><br><span> CPPFLAGS_common += -Isrc/soc/rockchip/rk3288/include</span><br><span> CPPFLAGS_common += -Isrc/soc/rockchip/common/include</span><br><span>diff --git a/src/soc/rockchip/rk3399/Makefile.inc b/src/soc/rockchip/rk3399/Makefile.inc</span><br><span>index 83936e8..854eb84 100644</span><br><span>--- a/src/soc/rockchip/rk3399/Makefile.inc</span><br><span>+++ b/src/soc/rockchip/rk3399/Makefile.inc</span><br><span>@@ -22,9 +22,7 @@</span><br><span> </span><br><span> bootblock-y += ../common/i2c.c</span><br><span> bootblock-y += ../common/spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += ../common/uart.c</span><br><span> bootblock-y += ../common/gpio.c</span><br><span> bootblock-y += ../common/pwm.c</span><br><span> bootblock-y += bootblock.c</span><br><span>@@ -39,7 +37,7 @@</span><br><span> verstage-y += sdram.c</span><br><span> verstage-y += ../common/i2c.c</span><br><span> verstage-y += ../common/spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-y += ../common/uart.c</span><br><span> verstage-y += clock.c</span><br><span> verstage-y += timer.c</span><br><span> </span><br><span>@@ -48,7 +46,7 @@</span><br><span> romstage-y += ../common/cbmem.c</span><br><span> romstage-y += sdram.c</span><br><span> romstage-y += ../common/spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += ../common/uart.c</span><br><span> romstage-y += clock.c</span><br><span> romstage-y += ../common/pwm.c</span><br><span> romstage-y += timer.c</span><br><span>@@ -64,7 +62,7 @@</span><br><span> ramstage-y += ../common/cbmem.c</span><br><span> ramstage-y += sdram.c</span><br><span> ramstage-y += ../common/spi.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_DRIVERS_UART) += ../common/uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += ../common/uart.c</span><br><span> ramstage-y += clock.c</span><br><span> ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += display.c</span><br><span> ramstage-$(CONFIG_MAINBOARD_DO_NATIVE_VGA_INIT) += ../common/edp.c</span><br><span>diff --git a/src/soc/samsung/exynos5250/Makefile.inc b/src/soc/samsung/exynos5250/Makefile.inc</span><br><span>index 2731f17..a6eb9ee 100644</span><br><span>--- a/src/soc/samsung/exynos5250/Makefile.inc</span><br><span>+++ b/src/soc/samsung/exynos5250/Makefile.inc</span><br><span>@@ -4,11 +4,9 @@</span><br><span> bootblock-y += bootblock.c</span><br><span> bootblock-y += pinmux.c timer.c power.c</span><br><span> # Clock is required for UART</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += clock_init.c</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += clock.c</span><br><span style="color: hsl(0, 100%, 40%);">-ifeq ($(CONFIG_DRIVERS_UART),y)</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += uart.c</span><br><span style="color: hsl(0, 100%, 40%);">-endif</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += clock_init.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += clock.c</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-y += uart.c</span><br><span> bootblock-y += wakeup.c</span><br><span> bootblock-y += gpio.c</span><br><span> </span><br><span>@@ -20,7 +18,7 @@</span><br><span> romstage-y += dmc_init_ddr3.c</span><br><span> romstage-y += power.c</span><br><span> romstage-y += timer.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-y += uart.c</span><br><span> romstage-y += wakeup.c</span><br><span> romstage-y += gpio.c</span><br><span> romstage-y += trustzone.c</span><br><span>@@ -33,7 +31,7 @@</span><br><span> ramstage-y += clock_init.c</span><br><span> ramstage-y += pinmux.c</span><br><span> ramstage-y += power.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-$(CONFIG_DRIVERS_UART) += uart.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-y += uart.c</span><br><span> ramstage-y += cpu.c</span><br><span> ramstage-y += tmu.c</span><br><span> ramstage-y += timer.c</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/29572">change 29572</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/29572"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0ea73a8909f07202b23c88db93df74cf9dc8abf9 </div>
<div style="display:none"> Gerrit-Change-Number: 29572 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>