From 48e21ec430cf83f540bf189b1dfa372938cc9b36 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Wed, 14 Nov 2012 08:08:50 +0200 Subject: Add mainboard hook to bootblock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/1845 Reviewed-by: Patrick Georgi Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/arch/x86/Kconfig | 3 +++ src/arch/x86/include/bootblock_common.h | 4 ++++ 2 files changed, 7 insertions(+) (limited to 'src') 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 -- cgit v1.2.3