aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@chromium.org>2015-04-16 15:27:52 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-04-20 18:43:36 +0200
commit01368ed5edca94582185b603350f8e70f9b16f45 (patch)
tree4a1adfd268b8f8b712fc49fd2c62a271b83e31ad
parentc047b107ec138b72f5a4671ba6eb3acd96eaa065 (diff)
downloadcoreboot-01368ed5edca94582185b603350f8e70f9b16f45.tar.gz
coreboot-01368ed5edca94582185b603350f8e70f9b16f45.tar.xz
coreboot-01368ed5edca94582185b603350f8e70f9b16f45.zip
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)
-rw-r--r--src/mainboard/google/veyron_brain/Kconfig2
-rw-r--r--src/mainboard/google/veyron_brain/bootblock.c2
-rw-r--r--src/mainboard/google/veyron_danger/Kconfig2
-rw-r--r--src/mainboard/google/veyron_danger/bootblock.c2
-rw-r--r--src/mainboard/google/veyron_jerry/Kconfig2
-rw-r--r--src/mainboard/google/veyron_jerry/bootblock.c2
-rw-r--r--src/mainboard/google/veyron_mighty/Kconfig2
-rw-r--r--src/mainboard/google/veyron_mighty/bootblock.c2
-rw-r--r--src/mainboard/google/veyron_pinky/Kconfig2
-rw-r--r--src/mainboard/google/veyron_pinky/bootblock.c2
-rw-r--r--src/mainboard/google/veyron_rialto/Kconfig2
-rw-r--r--src/mainboard/google/veyron_rialto/bootblock.c2
-rw-r--r--src/mainboard/google/veyron_speedy/Kconfig2
-rw-r--r--src/mainboard/google/veyron_speedy/bootblock.c2
-rw-r--r--src/soc/broadcom/cygnus/Kconfig2
-rw-r--r--src/soc/nvidia/tegra132/Makefile.inc2
16 files changed, 16 insertions, 16 deletions
diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig
index f8902c9bd..6361d9e7e 100644
--- a/src/mainboard/google/veyron_brain/Kconfig
+++ b/src/mainboard/google/veyron_brain/Kconfig
@@ -66,7 +66,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on DRIVERS_UART
default 0xFF690000
# FIXME(dhendrix): This is a gross hack intended to get us past
diff --git a/src/mainboard/google/veyron_brain/bootblock.c b/src/mainboard/google/veyron_brain/bootblock.c
index 8650e0eea..68234c960 100644
--- a/src/mainboard/google/veyron_brain/bootblock.c
+++ b/src/mainboard/google/veyron_brain/bootblock.c
@@ -36,7 +36,7 @@
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);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
}
diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig
index 294fd9702..4c7405421 100644
--- a/src/mainboard/google/veyron_danger/Kconfig
+++ b/src/mainboard/google/veyron_danger/Kconfig
@@ -67,7 +67,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on DRIVERS_UART
default 0xFF690000
config PMIC_BUS
diff --git a/src/mainboard/google/veyron_danger/bootblock.c b/src/mainboard/google/veyron_danger/bootblock.c
index 8650e0eea..68234c960 100644
--- a/src/mainboard/google/veyron_danger/bootblock.c
+++ b/src/mainboard/google/veyron_danger/bootblock.c
@@ -36,7 +36,7 @@
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);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
}
diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig
index 7730aba89..7127b0b48 100644
--- a/src/mainboard/google/veyron_jerry/Kconfig
+++ b/src/mainboard/google/veyron_jerry/Kconfig
@@ -78,7 +78,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on DRIVERS_UART
default 0xFF690000
config PMIC_BUS
diff --git a/src/mainboard/google/veyron_jerry/bootblock.c b/src/mainboard/google/veyron_jerry/bootblock.c
index 2f012ec80..19c2aec0d 100644
--- a/src/mainboard/google/veyron_jerry/bootblock.c
+++ b/src/mainboard/google/veyron_jerry/bootblock.c
@@ -36,7 +36,7 @@
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);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
}
diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig
index 5482e0f8e..0a65b3176 100644
--- a/src/mainboard/google/veyron_mighty/Kconfig
+++ b/src/mainboard/google/veyron_mighty/Kconfig
@@ -78,7 +78,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on DRIVERS_UART
default 0xFF690000
config PMIC_BUS
diff --git a/src/mainboard/google/veyron_mighty/bootblock.c b/src/mainboard/google/veyron_mighty/bootblock.c
index 2f012ec80..19c2aec0d 100644
--- a/src/mainboard/google/veyron_mighty/bootblock.c
+++ b/src/mainboard/google/veyron_mighty/bootblock.c
@@ -36,7 +36,7 @@
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);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
}
diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig
index 0c991c7c2..f6aea37ae 100644
--- a/src/mainboard/google/veyron_pinky/Kconfig
+++ b/src/mainboard/google/veyron_pinky/Kconfig
@@ -78,7 +78,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on DRIVERS_UART
default 0xFF690000
config PMIC_BUS
diff --git a/src/mainboard/google/veyron_pinky/bootblock.c b/src/mainboard/google/veyron_pinky/bootblock.c
index 2f012ec80..19c2aec0d 100644
--- a/src/mainboard/google/veyron_pinky/bootblock.c
+++ b/src/mainboard/google/veyron_pinky/bootblock.c
@@ -36,7 +36,7 @@
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);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
}
diff --git a/src/mainboard/google/veyron_rialto/Kconfig b/src/mainboard/google/veyron_rialto/Kconfig
index 8393895e1..bc40ccb59 100644
--- a/src/mainboard/google/veyron_rialto/Kconfig
+++ b/src/mainboard/google/veyron_rialto/Kconfig
@@ -74,7 +74,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on DRIVERS_UART
default 0xFF690000
# FIXME(dhendrix): This is a gross hack intended to get us past
diff --git a/src/mainboard/google/veyron_rialto/bootblock.c b/src/mainboard/google/veyron_rialto/bootblock.c
index 86104ece3..ab9d60dad 100644
--- a/src/mainboard/google/veyron_rialto/bootblock.c
+++ b/src/mainboard/google/veyron_rialto/bootblock.c
@@ -36,7 +36,7 @@
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);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
}
diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig
index 4d7f45d28..facd7155c 100644
--- a/src/mainboard/google/veyron_speedy/Kconfig
+++ b/src/mainboard/google/veyron_speedy/Kconfig
@@ -78,7 +78,7 @@ config DRIVER_TPM_I2C_ADDR
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on DRIVERS_UART
default 0xFF690000
config PMIC_BUS
diff --git a/src/mainboard/google/veyron_speedy/bootblock.c b/src/mainboard/google/veyron_speedy/bootblock.c
index 2f012ec80..19c2aec0d 100644
--- a/src/mainboard/google/veyron_speedy/bootblock.c
+++ b/src/mainboard/google/veyron_speedy/bootblock.c
@@ -36,7 +36,7 @@
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);
writel(IOMUX_UART2, &rk3288_grf->iomux_uart2);
}
diff --git a/src/soc/broadcom/cygnus/Kconfig b/src/soc/broadcom/cygnus/Kconfig
index 2ccc30676..89023a947 100644
--- a/src/soc/broadcom/cygnus/Kconfig
+++ b/src/soc/broadcom/cygnus/Kconfig
@@ -41,7 +41,7 @@ config BOOTBLOCK_CPU_INIT
config CONSOLE_SERIAL_UART_ADDRESS
hex
- depends on CONSOLE_SERIAL_UART
+ depends on DRIVERS_UART
default 0x18023000
endif
diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc
index 091c18670..fb81548a1 100644
--- a/src/soc/nvidia/tegra132/Makefile.inc
+++ b/src/soc/nvidia/tegra132/Makefile.inc
@@ -27,7 +27,7 @@ verstage-y += monotonic_timer.c
verstage-y += spi.c
verstage-y += padconfig.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/i2c.c
verstage-y += ../tegra/pinmux.c