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>