[coreboot-gerrit] New patch to review for coreboot: 7993184 x86: Support reset routines in bootblock

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9504

-gerrit

commit 7993184a19bfb547f059cc1f50fec87496bb4519
Author: Lee Leahy <leroy.p.leahy at intel.com>
Date:   Mon Feb 9 21:09:49 2015 -0800

    x86: Support reset routines in bootblock
    
    Expand the boot block include file to allow for a file containing reset
    routines to be added.  Prevent breaking existing platforms by using a
    Kconfig value to specify the path to this file, and have the code
    include this file only if the Kconfig value is set.
    
    BRANCH=none
    BUG=None
    TEST=Build and run on Glados
    
    Change-Id: I604f701057d7018f2ed9c3ba49a643c4bca13f00
    Signed-off-by: Stefan Reinauer <reinauer at chromium.org>
    Original-Commit-Id: c109481d9503916e19ed300c1a3f085e0d2b5c51
    Original-Change-Id: I3214399f8156b5ea2ef709ce77e3915cea1523a3
    Original-Signed-off-by: Lee Leahy <Leroy.P.Leahy at intel.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/248300
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Commit-Queue: Leroy P Leahy <leroy.p.leahy at intel.com>
    Original-Tested-by: Leroy P Leahy <leroy.p.leahy at intel.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 f7da89a..29f0514 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -84,6 +84,9 @@ config BOOTBLOCK_MAINBOARD_INIT
 config BOOTBLOCK_NORTHBRIDGE_INIT
 	string
 
+config BOOTBLOCK_RESETS
+	string
+
 config HAVE_CMOS_DEFAULT
 	def_bool n
 
diff --git a/src/arch/x86/include/bootblock_common.h b/src/arch/x86/include/bootblock_common.h
index b4100b7..939ba08 100644
--- a/src/arch/x86/include/bootblock_common.h
+++ b/src/arch/x86/include/bootblock_common.h
@@ -2,6 +2,10 @@
 #include <cpu/x86/lapic/boot_cpu.c>
 #include <pc80/mc146818rtc.h>
 
+#ifdef CONFIG_BOOTBLOCK_RESETS
+#include CONFIG_BOOTBLOCK_RESETS
+#endif
+
 #ifdef CONFIG_BOOTBLOCK_CPU_INIT
 #include CONFIG_BOOTBLOCK_CPU_INIT
 #endif