Patrick Georgi (pgeorgi@google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9350
-gerrit
commit 1893c4e7a15bdfafd29283e243435b8fe850c397 Author: Patrick Georgi pgeorgi@chromium.org Date: Tue Apr 7 13:49:32 2015 +0200
console: fix Kconfig uses
While upstreaming, some old (or downstream) names sneaked in.
Change-Id: I148fd8f46bc88c38ce1f62efe5771555bd5dcc5c Signed-off-by: Patrick Georgi pgeorgi@chromium.org --- src/soc/intel/broadwell/romstage/Makefile.inc | 2 +- src/soc/rockchip/rk3288/Makefile.inc | 2 +- src/soc/rockchip/rk3288/bootblock.c | 2 +- 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 f8a9617..ae0f980 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 9885aaf..d193783 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 26a6569..6dde1cb 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);