summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorAndrey Petrov <andrey.petrov@intel.com>2016-02-08 17:46:31 -0800
committerAaron Durbin <adurbin@chromium.org>2016-02-11 06:22:08 +0100
commit3bc543a5c320b7edb67e8951c8e7a897a01af8a9 (patch)
treecf1714a35780bdc9edfff09fafb10af514541307 /src/arch
parent6a1219cfe0e97af9aefc3b55397f5936af4e3e9d (diff)
downloadcoreboot-3bc543a5c320b7edb67e8951c8e7a897a01af8a9.tar.xz
arch/x86: Change how BOOTBLOCK_CUSTOM is selected by default
Currently x86s select BOOTBLOCK_CUSTOM by default. With this change BOOTBLOCK_CUSTOM is selected only if C bootblock isn't. Change-Id: I218f3b4044175b89697790c82c384b0f85a27ade Signed-off-by: Andrey Petrov <andrey.petrov@intel.com> Reviewed-on: https://review.coreboot.org/13642 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 49f940acd1..889e811aee 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -24,7 +24,7 @@ config ARCH_BOOTBLOCK_X86_32
bool
default n
select ARCH_X86
- select BOOTBLOCK_CUSTOM
+ select BOOTBLOCK_CUSTOM if !C_ENVIRONMENT_BOOTBLOCK
config ARCH_VERSTAGE_X86_32
bool
@@ -44,7 +44,7 @@ config ARCH_BOOTBLOCK_X86_64
bool
default n
select ARCH_X86
- select BOOTBLOCK_CUSTOM
+ select BOOTBLOCK_CUSTOM if !C_ENVIRONMENT_BOOTBLOCK
config ARCH_VERSTAGE_X86_64
bool