summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/gru/bootblock.c16
-rw-r--r--src/mainboard/google/veyron/bootblock.c3
-rw-r--r--src/mainboard/google/veyron_mickey/bootblock.c3
-rw-r--r--src/mainboard/google/veyron_rialto/bootblock.c3
4 files changed, 11 insertions, 14 deletions
diff --git a/src/mainboard/google/gru/bootblock.c b/src/mainboard/google/gru/bootblock.c
index 0013414bf5..b2f7d57691 100644
--- a/src/mainboard/google/gru/bootblock.c
+++ b/src/mainboard/google/gru/bootblock.c
@@ -49,16 +49,16 @@ void bootblock_mainboard_early_init(void)
if (!IS_ENABLED(CONFIG_GRU_BASEBOARD_SCARLET))
gpio_output(GPIO_P15V_EN, 1); /* Scarlet: EC-controlled */
-#if IS_ENABLED(CONFIG_DRIVERS_UART)
- _Static_assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE,
- "CONSOLE_SERIAL_UART should be UART2");
+ if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {
+ _Static_assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE,
+ "CONSOLE_SERIAL_UART should be UART2");
- /* iomux: select gpio4c[4:3] as uart2 dbg port */
- write32(&rk3399_grf->iomux_uart2c, IOMUX_UART2C);
+ /* iomux: select gpio4c[4:3] as uart2 dbg port */
+ write32(&rk3399_grf->iomux_uart2c, IOMUX_UART2C);
- /* grf soc_con7[11:10] use for uart2 select */
- write32(&rk3399_grf->soc_con7, UART2C_SEL);
-#endif
+ /* grf soc_con7[11:10] use for uart2 select */
+ write32(&rk3399_grf->soc_con7, UART2C_SEL);
+ }
}
static void configure_spi_flash(void)
diff --git a/src/mainboard/google/veyron/bootblock.c b/src/mainboard/google/veyron/bootblock.c
index 5126ce5b70..8648a3c212 100644
--- a/src/mainboard/google/veyron/bootblock.c
+++ b/src/mainboard/google/veyron/bootblock.c
@@ -31,11 +31,10 @@
void bootblock_mainboard_early_init()
{
- if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
+ if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
write32(&rk3288_grf->iomux_uart2, IOMUX_UART2);
}
-
}
void bootblock_mainboard_init(void)
diff --git a/src/mainboard/google/veyron_mickey/bootblock.c b/src/mainboard/google/veyron_mickey/bootblock.c
index 1110a0b085..28f6b14530 100644
--- a/src/mainboard/google/veyron_mickey/bootblock.c
+++ b/src/mainboard/google/veyron_mickey/bootblock.c
@@ -31,11 +31,10 @@
void bootblock_mainboard_early_init()
{
- if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
+ if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
write32(&rk3288_grf->iomux_uart2, IOMUX_UART2);
}
-
}
void bootblock_mainboard_init(void)
diff --git a/src/mainboard/google/veyron_rialto/bootblock.c b/src/mainboard/google/veyron_rialto/bootblock.c
index 1ba01fb648..626d987e72 100644
--- a/src/mainboard/google/veyron_rialto/bootblock.c
+++ b/src/mainboard/google/veyron_rialto/bootblock.c
@@ -31,11 +31,10 @@
void bootblock_mainboard_early_init()
{
- if (IS_ENABLED(CONFIG_DRIVERS_UART)) {
+ if (IS_ENABLED(CONFIG_CONSOLE_SERIAL)) {
assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE);
write32(&rk3288_grf->iomux_uart2, IOMUX_UART2);
}
-
}
void bootblock_mainboard_init(void)