diff options
| -rw-r--r-- | src/arch/arm/armv4/bootblock_simple.c | 7 | ||||
| -rw-r--r-- | src/arch/arm/armv7/bootblock_simple.c | 7 | ||||
| -rw-r--r-- | src/arch/arm/include/bootblock_common.h | 1 | ||||
| -rw-r--r-- | src/mainboard/google/rush/bootblock.c | 2 | ||||
| -rw-r--r-- | src/mainboard/google/rush_ryu/bootblock.c | 2 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra132/bootblock.c | 1 | ||||
| -rw-r--r-- | src/soc/nvidia/tegra132/include/soc/bootblock.h | 32 |
7 files changed, 13 insertions, 39 deletions
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 <console/console.h> #include <program_loading.h> +__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 <program_loading.h> #include <smp/node.h> +__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 <arch/io.h> +#include <bootblock_common.h> #include <console/console.h> #include <device/i2c.h> #include <soc/addressmap.h> #include <soc/clk_rst.h> -#include <soc/bootblock.h> #include <soc/clock.h> #include <soc/funitcfg.h> #include <soc/nvidia/tegra/i2c.h> 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 <arch/io.h> +#include <bootblock_common.h> #include <console/console.h> #include <device/i2c.h> #include <soc/addressmap.h> -#include <soc/bootblock.h> #include <soc/clk_rst.h> #include <soc/clock.h> #include <soc/funitcfg.h> 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 <console/console.h> #include <program_loading.h> #include <soc/addressmap.h> -#include <soc/bootblock.h> #include <soc/clock.h> #include <soc/nvidia/tegra/apbmisc.h> #include <soc/power.h> 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 <bootblock_common.h> - -/* - * 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__ */ |