[coreboot-gerrit] New patch to review for coreboot: Only show CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM option when implemented

Arthur Heymans (arthur@aheymans.xyz) gerrit at coreboot.org
Wed Jan 25 17:31:56 CET 2017


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 4091a4b10697c35b6ec773449fe9409afce269ea
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
    
    On targets that don't implement this build fails if selected.
    
    Change-Id: I50b9ee8bbfb3611fccfd1cfde58c6c9f46b189ca
    Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
 src/Kconfig                           | 7 ++++++-
 src/northbridge/intel/haswell/Kconfig | 1 +
 src/soc/intel/apollolake/Kconfig      | 1 +
 src/soc/intel/broadwell/Kconfig       | 1 +
 src/soc/intel/skylake/Kconfig         | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Kconfig b/src/Kconfig
index 436964c..21bac5f 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -242,8 +242,13 @@ config RELOCATABLE_RAMSTAGE
 	 wake. When selecting this option the romstage is responsible for
 	 determing a stack location to use for loading the ramstage.
 
-config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
+config HAVE_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	depends on RELOCATABLE_RAMSTAGE
+	bool
+	default n
+
+config CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
+	depends on HAVE_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	bool "Cache the relocated ramstage outside of cbmem."
 	default n
 	help
diff --git a/src/northbridge/intel/haswell/Kconfig b/src/northbridge/intel/haswell/Kconfig
index 4fc117d..9df8e43 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 HAVE_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 
 if NORTHBRIDGE_INTEL_HASWELL
 
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index b37cde6..1e35202 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -26,6 +26,7 @@ config CPU_SPECIFIC_OPTIONS
 	select SOC_INTEL_COMMON_NHLT
 	# Misc options
 	select C_ENVIRONMENT_BOOTBLOCK
+	select HAVE_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE
 	select COLLECT_TIMESTAMPS
 	select COMMON_FADT
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 01bcaf1..572316f 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -15,6 +15,7 @@ config CPU_SPECIFIC_OPTIONS
 	select BOOT_DEVICE_SUPPORTS_WRITES
 	select CACHE_MRC_SETTINGS
 	select MRC_SETTINGS_PROTECT
+	select HAVE_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
 	select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 24c2e30..b546919 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -17,6 +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 HAVE_CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM if RELOCATABLE_RAMSTAGE
 	select C_ENVIRONMENT_BOOTBLOCK
 	select COLLECT_TIMESTAMPS



More information about the coreboot-gerrit mailing list