diff options
| author | Lee Leahy <leroy.p.leahy@intel.com> | 2015-02-09 21:09:49 -0800 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-04-10 20:28:45 +0200 |
| commit | 5f31f497ec2176781750c36f01e738fec0c615ed (patch) | |
| tree | 9a018d4557fa777b611a9f30a77e4bde9222c380 /src | |
| parent | bf5a4bbac5b32aa80190f87b8b5f5b24cc7e7af4 (diff) | |
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@chromium.org>
Original-Commit-Id: c109481d9503916e19ed300c1a3f085e0d2b5c51
Original-Change-Id: I3214399f8156b5ea2ef709ce77e3915cea1523a3
Original-Signed-off-by: Lee Leahy <Leroy.P.Leahy@intel.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/248300
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Commit-Queue: Leroy P Leahy <leroy.p.leahy@intel.com>
Original-Tested-by: Leroy P Leahy <leroy.p.leahy@intel.com>
Reviewed-on: http://review.coreboot.org/9504
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src')
| -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 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 <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 |