Kconfig: rename CONSOLE_SERIAL_UART to DRIVERS_UART

Some upstreaming patches missed that, so follow up.

Change-Id: I28665c97ac777d8b0b0f909e64b32681ed2b98f7
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/9771
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins)
This commit is contained in:
Patrick Georgi 2015-04-16 15:27:52 +02:00 committed by Patrick Georgi
parent c047b107ec
commit 01368ed5ed
16 changed files with 16 additions and 16 deletions

View File

@ -66,7 +66,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS config CONSOLE_SERIAL_UART_ADDRESS
hex hex
depends on CONSOLE_SERIAL_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
# FIXME(dhendrix): This is a gross hack intended to get us past # FIXME(dhendrix): This is a gross hack intended to get us past

View File

@ -36,7 +36,7 @@
void bootblock_mainboard_early_init() void bootblock_mainboard_early_init()
{ {
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
} }

View File

@ -67,7 +67,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS config CONSOLE_SERIAL_UART_ADDRESS
hex hex
depends on CONSOLE_SERIAL_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
config PMIC_BUS config PMIC_BUS

View File

@ -36,7 +36,7 @@
void bootblock_mainboard_early_init() void bootblock_mainboard_early_init()
{ {
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
} }

View File

@ -78,7 +78,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS config CONSOLE_SERIAL_UART_ADDRESS
hex hex
depends on CONSOLE_SERIAL_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
config PMIC_BUS config PMIC_BUS

View File

@ -36,7 +36,7 @@
void bootblock_mainboard_early_init() void bootblock_mainboard_early_init()
{ {
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
} }

View File

@ -78,7 +78,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS config CONSOLE_SERIAL_UART_ADDRESS
hex hex
depends on CONSOLE_SERIAL_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
config PMIC_BUS config PMIC_BUS

View File

@ -36,7 +36,7 @@
void bootblock_mainboard_early_init() void bootblock_mainboard_early_init()
{ {
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
} }

View File

@ -78,7 +78,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS config CONSOLE_SERIAL_UART_ADDRESS
hex hex
depends on CONSOLE_SERIAL_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
config PMIC_BUS config PMIC_BUS

View File

@ -36,7 +36,7 @@
void bootblock_mainboard_early_init() void bootblock_mainboard_early_init()
{ {
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
} }

View File

@ -74,7 +74,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS config CONSOLE_SERIAL_UART_ADDRESS
hex hex
depends on CONSOLE_SERIAL_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
# FIXME(dhendrix): This is a gross hack intended to get us past # FIXME(dhendrix): This is a gross hack intended to get us past

View File

@ -36,7 +36,7 @@
void bootblock_mainboard_early_init() void bootblock_mainboard_early_init()
{ {
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
} }

View File

@ -78,7 +78,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS config CONSOLE_SERIAL_UART_ADDRESS
hex hex
depends on CONSOLE_SERIAL_UART depends on DRIVERS_UART
default 0xFF690000 default 0xFF690000
config PMIC_BUS config PMIC_BUS

View File

@ -36,7 +36,7 @@
void bootblock_mainboard_early_init() void bootblock_mainboard_early_init()
{ {
if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
} }

View File

@ -41,7 +41,7 @@ config BOOTBLOCK_CPU_INIT
config CONSOLE_SERIAL_UART_ADDRESS config CONSOLE_SERIAL_UART_ADDRESS
hex hex
depends on CONSOLE_SERIAL_UART depends on DRIVERS_UART
default 0x18023000 default 0x18023000
endif endif

View File

@ -27,7 +27,7 @@ verstage-y += monotonic_timer.c
verstage-y += spi.c verstage-y += spi.c
verstage-y += padconfig.c verstage-y += padconfig.c
verstage-y += funitcfg.c verstage-y += funitcfg.c
verstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c verstage-$(CONFIG_DRIVERS_UART) += uart.c
verstage-y += ../tegra/gpio.c verstage-y += ../tegra/gpio.c
verstage-y += ../tegra/i2c.c verstage-y += ../tegra/i2c.c
verstage-y += ../tegra/pinmux.c verstage-y += ../tegra/pinmux.c