diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2014-08-01 15:11:11 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-03-24 15:28:16 +0100 |
| commit | 6ecf3f66010ec5611a83f8da77513213fe52be80 (patch) | |
| tree | 06041ff4170f1447a5e4e00b8f106102065eff6f /src/soc/nvidia/tegra132/bootblock.c | |
| parent | f985621dd5072854ebed5587167d4a918852e975 (diff) | |
tegra132: add bootblock_mainboard_early_init()
Instead of hard coding certain pieces of a board in the common
chipset code provide a way to initialize things early in the
bootblock path. Add a bootblock_mainboard_early_init() function
before console init to performany necessary mainboard initialization
early in the bootblock.
BUG=chrome-os-partner:31104
BUG=chrome-os-partner:31105
BUG=chrome-os-partner:29981
BRANCH=None
TEST=built both on rush and ryu. rush still behaves the same.
Change-Id: Idcf081eeffd189a4e2cbfeb8a4ac5dd0a3d1f838
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 4a523add6de03bea0d88e95b9dbb5e283c629400
Original-Change-Id: I7d93641dff3a961f120e8f0ec2d959182477ef87
Original-Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/210835
Original-Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-on: http://review.coreboot.org/8877
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/soc/nvidia/tegra132/bootblock.c')
| -rw-r--r-- | src/soc/nvidia/tegra132/bootblock.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/soc/nvidia/tegra132/bootblock.c b/src/soc/nvidia/tegra132/bootblock.c index 3c484986d3..fc4c5cd4f1 100644 --- a/src/soc/nvidia/tegra132/bootblock.c +++ b/src/soc/nvidia/tegra132/bootblock.c @@ -22,25 +22,16 @@ #include <bootblock_common.h> #include <console/console.h> #include <program_loading.h> +#include <soc/bootblock.h> #include <soc/clock.h> -#include <soc/padconfig.h> #include <soc/nvidia/tegra/apbmisc.h> -#include "pinmux.h" #include "power.h" -static const struct pad_config uart_console_pads[] = { - /* Hard coded pad usage for UARTA. */ - PAD_CFG_SFIO(KB_ROW9, 0, UA3), - PAD_CFG_SFIO(KB_ROW10, PINMUX_INPUT_ENABLE | PINMUX_PULL_UP, UA3), - /* - * Disable UART2 pads as they are default connected to UARTA controller. - */ - PAD_CFG_UNUSED(UART2_RXD), - PAD_CFG_UNUSED(UART2_TXD), - PAD_CFG_UNUSED(UART2_RTS_N), - PAD_CFG_UNUSED(UART2_CTS_N), -}; +void __attribute__((weak)) bootblock_mainboard_early_init(void) +{ + /* Empty default implementation. */ +} void main(void) { @@ -52,7 +43,7 @@ void main(void) clock_early_uart(); - soc_configure_pads(uart_console_pads, ARRAY_SIZE(uart_console_pads)); + bootblock_mainboard_early_init(); if (CONFIG_BOOTBLOCK_CONSOLE) { console_init(); |