diff options
-rw-r--r-- | src/mainboard/google/veyron_brain/Kconfig | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_brain/bootblock.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_danger/Kconfig | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_danger/bootblock.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_jerry/Kconfig | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_jerry/bootblock.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_mighty/Kconfig | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_mighty/bootblock.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_pinky/Kconfig | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_pinky/bootblock.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_rialto/Kconfig | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_rialto/bootblock.c | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_speedy/Kconfig | 2 | ||||
-rw-r--r-- | src/mainboard/google/veyron_speedy/bootblock.c | 2 | ||||
-rw-r--r-- | src/soc/broadcom/cygnus/Kconfig | 2 | ||||
-rw-r--r-- | src/soc/nvidia/tegra132/Makefile.inc | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index f8902c9bd4fd..6361d9e7e2f8 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 8650e0eea23c..68234c960977 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 294fd97023fc..4c7405421b71 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 8650e0eea23c..68234c960977 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 7730aba89af8..7127b0b4801f 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 2f012ec80e99..19c2aec0dba2 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 5482e0f8e23f..0a65b3176bbf 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 2f012ec80e99..19c2aec0dba2 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 0c991c7c2887..f6aea37ae38c 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 2f012ec80e99..19c2aec0dba2 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 8393895e1648..bc40ccb59f45 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 86104ece38b8..ab9d60dad059 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 4d7f45d28714..facd7155c3b2 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 2f012ec80e99..19c2aec0dba2 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 2ccc30676d8c..89023a947405 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 091c186701f9..fb81548a1610 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 |