Change in coreboot[master]: Kconfig: Set better defaults for building romstage

[Arthur Heymans (Code Review)]

Attention is currently required from: Andrey Petrov.
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/63419 )

Change subject: Kconfig: Set better defaults for building romstage
......................................................................

Kconfig: Set better defaults for building romstage

On x86 there is generally no reason to have a separate romstage unless
VBOOT is used.

Change-Id: I4c53b6fa7a3e66415c5b1c539918a6c1cd8defa1
Signed-off-by: Arthur Heymans 
---
M src/Kconfig
M src/soc/intel/apollolake/Kconfig
2 files changed, 6 insertions(+), 1 deletion(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/19/63419/1

diff --git a/src/Kconfig b/src/Kconfig
index 418284b..35f4425 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -185,7 +185,6 @@

config SEPARATE_ROMSTAGE
    bool "Build a separate romstage"
-	default y

config INCLUDE_CONFIG_FILE
    bool "Include the coreboot .config file into the ROM image"
@@ -1379,3 +1378,8 @@
    bool
    default n if RAMPAYLOAD
    default y
+
+config SEPARATE_ROMSTAGE
+	bool
+	default y if VBOOT
+	default n if ARCH86
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 08ddfa4..fdb0736 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -119,6 +119,7 @@
    # This SoC does not map SPI flash like many previous SoC. Therefore we
    # provide a custom media driver that facilitates mapping
    select X86_CUSTOM_BOOTMEDIA
+	select SEPARATE_ROMSTAGE # The bootblock is too small

config SKIP_CSE_RBP
    bool