diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2012-11-14 08:08:50 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-11-30 00:58:03 +0100 |
| commit | 48e21ec430cf83f540bf189b1dfa372938cc9b36 (patch) | |
| tree | dc2b193454b694d2dbbb9388b247b5958922c3cb | |
| parent | f90224845d5a916863c3b060a58fd82ff8d6bec0 (diff) | |
| download | coreboot-48e21ec430cf83f540bf189b1dfa372938cc9b36.tar.xz | |
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@gmail.com>
Reviewed-on: http://review.coreboot.org/1845
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
| -rw-r--r-- | src/arch/x86/Kconfig | 3 | ||||
| -rw-r--r-- | src/arch/x86/include/bootblock_common.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 9bfd368c2e..5f46145f8e 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 bf325c4679..c24b5b0dd6 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> |