GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Kyösti Mälkki 2012-11-14 08:01:44 +02:00 committed by Stefan Reinauer
parent 90ca3b6bd7
commit f90224845d
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/arch/x86/include/bootblock_common.h
View File

@ -1,22 +1,28 @@
#include <cpu/x86/lapic/boot_cpu.c> #include <cpu/x86/lapic/boot_cpu.c>
#include <arch/cbfs.h>
#ifdef CONFIG_BOOTBLOCK_CPU_INIT #ifdef CONFIG_BOOTBLOCK_CPU_INIT
#include CONFIG_BOOTBLOCK_CPU_INIT #include CONFIG_BOOTBLOCK_CPU_INIT
#else
static void bootblock_cpu_init(void) { }
#endif #endif
#ifdef CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT #ifdef CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT
#include CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT #include CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT
#else
static void bootblock_northbridge_init(void) { }
#endif #endif
#ifdef CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT #ifdef CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT
#include CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT #include CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT
#else
static void bootblock_southbridge_init(void) { }
#endif #endif
#include <arch/cbfs.h> static void bootblock_mainboard_init(void)
{
#ifdef CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT
bootblock_northbridge_init();
#endif
#ifdef CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT
bootblock_southbridge_init();
#endif
#ifdef CONFIG_BOOTBLOCK_CPU_INIT
bootblock_cpu_init();
#endif
}
#if CONFIG_USE_OPTION_TABLE #if CONFIG_USE_OPTION_TABLE
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>

4
src/arch/x86/init/bootblock_normal.c
View File

@ -13,9 +13,7 @@ static void main(unsigned long bist)
const char *default_filenames = "normal/romstage\0fallback/romstage"; const char *default_filenames = "normal/romstage\0fallback/romstage";
if (boot_cpu()) { if (boot_cpu()) {
bootblock_northbridge_init(); bootblock_mainboard_init();
bootblock_southbridge_init();
bootblock_cpu_init();
#if CONFIG_USE_OPTION_TABLE #if CONFIG_USE_OPTION_TABLE
sanitize_cmos(); sanitize_cmos();

4
src/arch/x86/init/bootblock_simple.c
View File

@ -3,9 +3,7 @@
static void main(unsigned long bist) static void main(unsigned long bist)
{ {
if (boot_cpu()) { if (boot_cpu()) {
bootblock_northbridge_init(); bootblock_mainboard_init();
bootblock_southbridge_init();
bootblock_cpu_init();
#if CONFIG_USE_OPTION_TABLE #if CONFIG_USE_OPTION_TABLE
sanitize_cmos(); sanitize_cmos();