[coreboot-gerrit] Patch set updated for coreboot: Only show CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM option when implemented

[Arthur Heymans (arthur@aheymans.xyz)]

Arthur Heymans (arthur at aheymans.xyz) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18232

-gerrit

commit 8b40113e4f037ff39dd966968dfd466fce666fed
Author: Arthur Heymans <arthur at aheymans.xyz>
Date:   Wed Jan 25 15:27:52 2017 +0100

    Only show CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM option when implemented
    
    This also selects it by default on Haswell.
    
    This also removes the if RELOCATABLE_RAMSTAGE line since that is
    selected in the very same file.
    
    Change-Id: I50b9ee8bbfb3611fccfd1cfde58c6c9f46b189ca
    Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
 src/Kconfig                           | 2 +-
 src/northbridge/intel/haswell/Kconfig | 1 +
 src/soc/intel/apollolake/Kconfig      | 2 +-
 src/soc/intel/broadwell/Kconfig       | 2 +-
 src/soc/intel/skylake/Kconfig         | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Kconfig b/src/Kconfig
index 436964c..581c36b 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -244,7 +244,7 @@ config RELOCATABLE_RAMSTAGE
 
 config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	depends on RELOCATABLE_RAMSTAGE
-	bool "Cache the relocated ramstage outside of cbmem."
+	bool
 	default n
 	help
 	 The relocated ramstage is saved in an area specified by the
diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig
index 4fc117d..51122f0 100644
--- a/src/northbridge/intel/haswell/Kconfig
+++ b/src/northbridge/intel/haswell/Kconfig
@@ -20,6 +20,7 @@ config NORTHBRIDGE_INTEL_HASWELL
 	select INTEL_DDI
 	select INTEL_DP
 	select INTEL_GMA_ACPI
+	select RELOCATABLE_RAMSTAGE
 
 if NORTHBRIDGE_INTEL_HASWELL
 
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index b37cde6..b4d909d 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -26,7 +26,7 @@ config CPU_SPECIFIC_OPTIONS
 	select SOC_INTEL_COMMON_NHLT
 	# Misc options
 	select C_ENVIRONMENT_BOOTBLOCK
-	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE
+	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select COLLECT_TIMESTAMPS
 	select COMMON_FADT
 	select GENERIC_GPIO_LIB
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 01bcaf1..f17681b 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -15,7 +15,7 @@ config CPU_SPECIFIC_OPTIONS
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS
 	select MRC_SETTINGS_PROTECT
-	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE
+	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select HAVE_MONOTONIC_TIMER
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 24c2e30..db6011e 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -17,7 +17,7 @@ config CPU_SPECIFIC_OPTIONS
 	select BOOT_DEVICE_SPI_FLASH_RW_NOMMAP_EARLY if BOOT_DEVICE_SPI_FLASH
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS
-	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE
+	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select C_ENVIRONMENT_BOOTBLOCK
 	select COLLECT_TIMESTAMPS
 	select COMMON_FADT