diff options
| -rw-r--r-- | src/mainboard/google/veyron_jerry/bootblock.c | 10 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_mighty/bootblock.c | 10 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_pinky/bootblock.c | 10 | ||||
| -rw-r--r-- | src/soc/rockchip/rk3288/bootblock.c | 11 |
4 files changed, 30 insertions, 11 deletions
diff --git a/src/mainboard/google/veyron_jerry/bootblock.c b/src/mainboard/google/veyron_jerry/bootblock.c index 30b00e1145..1e46ed025c 100644 --- a/src/mainboard/google/veyron_jerry/bootblock.c +++ b/src/mainboard/google/veyron_jerry/bootblock.c @@ -19,6 +19,7 @@ */ #include <arch/io.h> +#include <assert.h> #include <bootblock_common.h> #include <delay.h> #include <soc/clock.h> @@ -31,6 +32,15 @@ #include "board.h" +void bootblock_mainboard_early_init() +{ + if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { + assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); + writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); + } + +} + void bootblock_mainboard_init(void) { /* Up VDD_CPU (BUCK1) to 1.4V to support max CPU frequency (1.8GHz). */ diff --git a/src/mainboard/google/veyron_mighty/bootblock.c b/src/mainboard/google/veyron_mighty/bootblock.c index 30b00e1145..1e46ed025c 100644 --- a/src/mainboard/google/veyron_mighty/bootblock.c +++ b/src/mainboard/google/veyron_mighty/bootblock.c @@ -19,6 +19,7 @@ */ #include <arch/io.h> +#include <assert.h> #include <bootblock_common.h> #include <delay.h> #include <soc/clock.h> @@ -31,6 +32,15 @@ #include "board.h" +void bootblock_mainboard_early_init() +{ + if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { + assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); + writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); + } + +} + void bootblock_mainboard_init(void) { /* Up VDD_CPU (BUCK1) to 1.4V to support max CPU frequency (1.8GHz). */ diff --git a/src/mainboard/google/veyron_pinky/bootblock.c b/src/mainboard/google/veyron_pinky/bootblock.c index 30b00e1145..1e46ed025c 100644 --- a/src/mainboard/google/veyron_pinky/bootblock.c +++ b/src/mainboard/google/veyron_pinky/bootblock.c @@ -19,6 +19,7 @@ */ #include <arch/io.h> +#include <assert.h> #include <bootblock_common.h> #include <delay.h> #include <soc/clock.h> @@ -31,6 +32,15 @@ #include "board.h" +void bootblock_mainboard_early_init() +{ + if (IS_ENABLED(CONFIG_CONSOLE_SERIAL_UART)) { + assert(CONFIG_CONSOLE_SERIAL_UART_ADDRESS == UART2_BASE); + writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); + } + +} + void bootblock_mainboard_init(void) { /* Up VDD_CPU (BUCK1) to 1.4V to support max CPU frequency (1.8GHz). */ diff --git a/src/soc/rockchip/rk3288/bootblock.c b/src/soc/rockchip/rk3288/bootblock.c index 84a17c2e22..4a5b0d269f 100644 --- a/src/soc/rockchip/rk3288/bootblock.c +++ b/src/soc/rockchip/rk3288/bootblock.c @@ -31,17 +31,6 @@ static void bootblock_soc_init(void) { rk3288_init_timer(); - if (IS_ENABLED(CONFIG_DRIVERS_UART)) { - switch (CONFIG_CONSOLE_SERIAL_UART_ADDRESS) { - case UART2_BASE: - writel(IOMUX_UART2, &rk3288_grf->iomux_uart2); - break; - default: - die("TODO: Handle setup for console UART if needed"); - } - console_init(); - } - rkclk_init(); mmu_init(); |