From f90224845d5a916863c3b060a58fd82ff8d6bec0 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Wed, 14 Nov 2012 08:01:44 +0200 Subject: Refactor bootblock initialisation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Makes it a bit easier to implement mainboard-specific behaviour while executing the bootblock. Change-Id: I04e87f89efb4fad1c0e20b62ea6a50329a286205 Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/1844 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/arch/x86/init/bootblock_normal.c | 4 +--- src/arch/x86/init/bootblock_simple.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'src/arch/x86/init') diff --git a/src/arch/x86/init/bootblock_normal.c b/src/arch/x86/init/bootblock_normal.c index 19b3d5ad5f..82bad53d17 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 fd9ba2289b..204636e072 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(); -- cgit v1.2.3