From 5f31f497ec2176781750c36f01e738fec0c615ed Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Mon, 9 Feb 2015 21:09:49 -0800 Subject: 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 Original-Commit-Id: c109481d9503916e19ed300c1a3f085e0d2b5c51 Original-Change-Id: I3214399f8156b5ea2ef709ce77e3915cea1523a3 Original-Signed-off-by: Lee Leahy Original-Reviewed-on: https://chromium-review.googlesource.com/248300 Original-Reviewed-by: Aaron Durbin Original-Commit-Queue: Leroy P Leahy Original-Tested-by: Leroy P Leahy Reviewed-on: http://review.coreboot.org/9504 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- 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 f7da89a5b6..29f0514bca 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 b4100b73a2..939ba08a67 100644 --- a/src/arch/x86/include/bootblock_common.h +++ b/src/arch/x86/include/bootblock_common.h @@ -2,6 +2,10 @@ #include #include +#ifdef CONFIG_BOOTBLOCK_RESETS +#include CONFIG_BOOTBLOCK_RESETS +#endif + #ifdef CONFIG_BOOTBLOCK_CPU_INIT #include CONFIG_BOOTBLOCK_CPU_INIT #endif -- cgit v1.2.3