[coreboot] New patch to review for coreboot: 664025e Add mainboard hook to bootblock

Kyösti Mälkki (kyosti.malkki@gmail.com) gerrit at coreboot.org
Wed Nov 14 08:08:59 CET 2012


Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1845

-gerrit

commit 664025e4b6e33b1bd2d672e360748915b8f22542
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Wed Nov 14 08:08:50 2012 +0200

    Add mainboard hook to bootblock
    
    Change allows to override default bootblock_mainboard_init() with
    mainboard-specific code.
    
    If the default bootblock_mainboard_init() handler is replaced, with
    one from file BOOTBLOCK_MAINBOARD_INIT, one needs to take care the
    replacement calls all the necessary bootblock_x_init() functions.
    
    Change-Id: Ie8c667cdba7cafe9ed2d4b19ab2bd21d941ad4ca
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/arch/x86/Kconfig                    | 3 +++
 src/arch/x86/include/bootblock_common.h | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index ec52d0e..5a79516 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -70,6 +70,9 @@ config PC80_SYSTEM
 	bool
 	default y
 
+config BOOTBLOCK_MAINBOARD_INIT
+	string
+
 config BOOTBLOCK_NORTHBRIDGE_INIT
 	string
 
diff --git a/src/arch/x86/include/bootblock_common.h b/src/arch/x86/include/bootblock_common.h
index d7c591d..ca283f5 100644
--- a/src/arch/x86/include/bootblock_common.h
+++ b/src/arch/x86/include/bootblock_common.h
@@ -11,6 +11,9 @@
 #include CONFIG_BOOTBLOCK_SOUTHBRIDGE_INIT
 #endif
 
+#ifdef CONFIG_BOOTBLOCK_MAINBOARD_INIT
+#include CONFIG_BOOTBLOCK_MAINBOARD_INIT
+#else
 static void bootblock_mainboard_init(void)
 {
 #ifdef CONFIG_BOOTBLOCK_NORTHBRIDGE_INIT
@@ -23,6 +26,7 @@ static void bootblock_mainboard_init(void)
 	bootblock_cpu_init();
 #endif
 }
+#endif
 
 #if CONFIG_USE_OPTION_TABLE
 #include <pc80/mc146818rtc.h>




More information about the coreboot mailing list