aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch/x86/init
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2012-11-14 08:01:44 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2012-11-30 00:57:58 +0100
commitf90224845d5a916863c3b060a58fd82ff8d6bec0 (patch)
tree2e12a1c5099903f6142995fec48365f447623682 /src/arch/x86/init
parent90ca3b6bd7d7849898fe2363a9e6d0e002c95943 (diff)
downloadcoreboot-f90224845d5a916863c3b060a58fd82ff8d6bec0.tar.gz
coreboot-f90224845d5a916863c3b060a58fd82ff8d6bec0.tar.xz
coreboot-f90224845d5a916863c3b060a58fd82ff8d6bec0.zip
Refactor bootblock initialisation
Makes it a bit easier to implement mainboard-specific behaviour while executing the bootblock. Change-Id: I04e87f89efb4fad1c0e20b62ea6a50329a286205 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/1844 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/arch/x86/init')
-rw-r--r--src/arch/x86/init/bootblock_normal.c4
-rw-r--r--src/arch/x86/init/bootblock_simple.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c
index 19b3d5ad5..82bad53d1 100644
--- a/src/arch/x86/init/bootblock_normal.c
+++ b/src/arch/x86/init/bootblock_normal.c
@@ -13,9 +13,7 @@ static void main(unsigned long bist)
const char *default_filenames = "normal/romstage\0fallback/romstage";
if (boot_cpu()) {
- bootblock_northbridge_init();
- bootblock_southbridge_init();
- bootblock_cpu_init();
+ bootblock_mainboard_init();
#if CONFIG_USE_OPTION_TABLE
sanitize_cmos();
diff --git a/src/arch/x86/init/bootblock_simple.c b/src/arch/x86/init/bootblock_simple.c
index fd9ba2289..204636e07 100644
--- a/src/arch/x86/init/bootblock_simple.c
+++ b/src/arch/x86/init/bootblock_simple.c
@@ -3,9 +3,7 @@
static void main(unsigned long bist)
{
if (boot_cpu()) {
- bootblock_northbridge_init();
- bootblock_southbridge_init();
- bootblock_cpu_init();
+ bootblock_mainboard_init();
#if CONFIG_USE_OPTION_TABLE
sanitize_cmos();