summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-04-07 13:49:32 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-04-08 09:32:19 +0200
commit94e4d81d073caeb3ac4b8fd0bbe20df9f98a2161 (patch)
tree02e571743683b718577b023dd9f9e1fbbb6722eb
parent7a453ebed2b87780100391b7ab78d41337890a66 (diff)
console: fix Kconfig uses
While upstreaming, some old (or downstream) names sneaked in. Change-Id: I148fd8f46bc88c38ce1f62efe5771555bd5dcc5c Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Reviewed-on: http://review.coreboot.org/9350 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/soc/intel/broadwell/romstage/Makefile.inc2
-rw-r--r--src/soc/rockchip/rk3288/Makefile.inc2
-rw-r--r--src/soc/rockchip/rk3288/bootblock.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/soc/intel/broadwell/romstage/Makefile.inc b/src/soc/intel/broadwell/romstage/Makefile.inc
index f8a961795b..ae0f9806fd 100644
--- a/src/soc/intel/broadwell/romstage/Makefile.inc
+++ b/src/soc/intel/broadwell/romstage/Makefile.inc
@@ -10,4 +10,4 @@ romstage-y += smbus.c
romstage-y += spi.c
romstage-y += stack.c
romstage-y += systemagent.c
-romstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart.c
+romstage-$(CONFIG_DRIVERS_UART_8250MEM) += uart.c
diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc
index 9885aaf2c8..d19378377d 100644
--- a/src/soc/rockchip/rk3288/Makefile.inc
+++ b/src/soc/rockchip/rk3288/Makefile.inc
@@ -36,7 +36,7 @@ bootblock-y += rk808.c
verstage-y += monotonic_timer.c
verstage-y += spi.c
verstage-y += timer.c
-verstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c
+verstage-$(CONFIG_DRIVERS_UART) += uart.c
verstage-y += gpio.c
verstage-y += clock.c
verstage-y += i2c.c
diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c
index 26a6569f29..6dde1cb943 100644
--- a/src/soc/rockchip/rk3288/bootblock.c
+++ b/src/soc/rockchip/rk3288/bootblock.c
@@ -31,7 +31,7 @@ static void bootblock_cpu_init(void)
{
rk3288_init_timer();
- if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) {
+ if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
switch (CONFIG_CONSOLE_SERIAL_UART_ADDRESS) {
case UART2_BASE:
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);