From f1e321001d5954096f06f9a43138219a9a46536e Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Tue, 25 Nov 2014 13:22:20 -0800 Subject: [PATCH] arm: Add bootblock_mainboard_early_init() for pre-console initialization On most platforms, enabling the console and exception handlers are amongst the very first things you want to do, as they help you see what's going on and debug errors in other early init code. However, most ARM boards require some small amount of board-specific initialization (pinmuxing, maybe clocks) to get the UART running, which is why bootblock_mainboard_init() (and with it almost all of the actual bootblock code) always had to run before console initialization for now. This patch introduces an explicit bootblock_mainboard_early_init() hook for only that part of initialization that absolutely needs to run before console output. The other two hooks for SoC and mainboard are moved below console_init(). This model has already proven its worth before in the tegra124 and tegra132 custom bootblocks. BRANCH=None BUG=chrome-os-partner:32123 TEST=Booted on Pinky. Compiled for Daisy, Storm and Ryu. Change-Id: I510c58189faf0c08c740bcc3b5a654f81f892464 Signed-off-by: Patrick Georgi Original-Commit-Id: f58e84a2fc1c9951e9c4c65cdec1dbeb6a20d597 Original-Change-Id: I4257b5a8807595140e8c973ca04e68ea8630bf9a Original-Signed-off-by: Julius Werner Original-Reviewed-on: https://chromium-review.googlesource.com/231941 Reviewed-on: http://review.coreboot.org/9603 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/arch/arm/armv4/bootblock_simple.c | 7 ++-- src/arch/arm/armv7/bootblock_simple.c | 7 ++-- src/arch/arm/include/bootblock_common.h | 1 + src/mainboard/google/rush/bootblock.c | 2 +- src/mainboard/google/rush_ryu/bootblock.c | 2 +- src/soc/nvidia/tegra132/bootblock.c | 1 - .../nvidia/tegra132/include/soc/bootblock.h | 32 ------------------- 7 files changed, 13 insertions(+), 39 deletions(-) delete mode 100644 src/soc/nvidia/tegra132/include/soc/bootblock.h diff --git a/src/arch/arm/armv4/bootblock_simple.c b/src/arch/arm/armv4/bootblock_simple.c index 9e399a9b7c..26646eebf5 100644 --- a/src/arch/arm/armv4/bootblock_simple.c +++ b/src/arch/arm/armv4/bootblock_simple.c @@ -26,18 +26,21 @@ #include #include +__attribute__((weak)) void bootblock_mainboard_early_init(void) { /* no-op */ } __attribute__((weak)) void bootblock_soc_init(void) { /* do nothing */ } __attribute__((weak)) void bootblock_mainboard_init(void) { /* do nothing */ } void main(void) { - bootblock_soc_init(); - bootblock_mainboard_init(); + bootblock_mainboard_early_init(); if (CONFIG_BOOTBLOCK_CONSOLE) { console_init(); exception_init(); } + bootblock_soc_init(); + bootblock_mainboard_init(); + run_romstage(); } diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c index 450e5b437b..564db5b80a 100644 --- a/src/arch/arm/armv7/bootblock_simple.c +++ b/src/arch/arm/armv7/bootblock_simple.c @@ -27,18 +27,21 @@ #include #include +__attribute__((weak)) void bootblock_mainboard_early_init(void) { /* no-op */ } __attribute__((weak)) void bootblock_soc_init(void) { /* do nothing */ } __attribute__((weak)) void bootblock_mainboard_init(void) { /* do nothing */ } void main(void) { - bootblock_soc_init(); - bootblock_mainboard_init(); + bootblock_mainboard_early_init(); #if CONFIG_BOOTBLOCK_CONSOLE console_init(); exception_init(); #endif + bootblock_soc_init(); + bootblock_mainboard_init(); + run_romstage(); } diff --git a/src/arch/arm/include/bootblock_common.h b/src/arch/arm/include/bootblock_common.h index 413a206177..06312928da 100644 --- a/src/arch/arm/include/bootblock_common.h +++ b/src/arch/arm/include/bootblock_common.h @@ -21,6 +21,7 @@ #define __ARCH_BOOTBLOCK_COMMON_H /* These are defined as weak no-ops that can be overridden by mainboard/SoC. */ +void bootblock_mainboard_early_init(void); void bootblock_mainboard_init(void); void bootblock_soc_init(void); diff --git a/src/mainboard/google/rush/bootblock.c b/src/mainboard/google/rush/bootblock.c index 6680cbaaab..2d099fb6c3 100644 --- a/src/mainboard/google/rush/bootblock.c +++ b/src/mainboard/google/rush/bootblock.c @@ -18,11 +18,11 @@ */ #include +#include #include #include #include #include -#include #include #include #include diff --git a/src/mainboard/google/rush_ryu/bootblock.c b/src/mainboard/google/rush_ryu/bootblock.c index 898bb3fdfe..2272ce1370 100644 --- a/src/mainboard/google/rush_ryu/bootblock.c +++ b/src/mainboard/google/rush_ryu/bootblock.c @@ -18,10 +18,10 @@ */ #include +#include #include #include #include -#include #include #include #include diff --git a/src/soc/nvidia/tegra132/bootblock.c b/src/soc/nvidia/tegra132/bootblock.c index 1c910ad041..ede46ef401 100644 --- a/src/soc/nvidia/tegra132/bootblock.c +++ b/src/soc/nvidia/tegra132/bootblock.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/src/soc/nvidia/tegra132/include/soc/bootblock.h b/src/soc/nvidia/tegra132/include/soc/bootblock.h deleted file mode 100644 index e225cc850d..0000000000 --- a/src/soc/nvidia/tegra132/include/soc/bootblock.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright 2014 Google Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __SOC_NVIDIA_TEGRA132_SOC_BOOTBLOCK_H__ -#define __SOC_NVIDIA_TEGRA132_SOC_BOOTBLOCK_H__ - -#include - -/* - * Perform any necessary mainboard-specific work early in bootblock. This is - * ran before consoles are brought up so any pad configuration could be done - * in this routine to enable console hardware. - */ -void bootblock_mainboard_early_init(void); - -#endif /* __SOC_NVIDIA_TEGRA132_SOC_BOOTBLOCK_H__ */