[coreboot-gerrit] New patch to review for coreboot: Intel Kconfig: Add CACHE_MRC_SETTINGS dependency on HAVE_MRC

[Martin Roth (martinroth@google.com)]

Martin Roth (martinroth at google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11271

-gerrit

commit e4cddedbd056e67ff2a05cbcbdebeb71e4545dfd
Author: Martin Roth <martinroth at google.com>
Date:   Tue Aug 18 11:09:14 2015 -0600

    Intel Kconfig: Add CACHE_MRC_SETTINGS dependency on HAVE_MRC
    
    Add dependency on HAVE_MRC for selections of CACHE_MRC_SETTINGS.
    
    Fixes Kconfig warnings:
    warning: (CPU_SPECIFIC_OPTIONS && CPU_SPECIFIC_OPTIONS
    && CPU_SPECIFIC_OPTIONS && CPU_SPECIFIC_OPTIONS)
    selects CACHE_MRC_SETTINGS which has unmet direct dependencies
    (SOC_INTEL_BROADWELL && HAVE_MRC || SOC_INTEL_COMMON && HAVE_MRC)
    
    Change-Id: I5f3e9e54e20050ba9ac0cd97b05b4490e361581f
    Signed-off-by: Martin Roth <martinroth at google.com>
---
 src/soc/intel/baytrail/Kconfig  | 2 +-
 src/soc/intel/braswell/Kconfig  | 2 +-
 src/soc/intel/broadwell/Kconfig | 2 +-
 src/soc/intel/skylake/Kconfig   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index 5754c15..1a1f90b 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -12,7 +12,7 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_RAMSTAGE_X86_32
 	select BACKUP_DEFAULT_SMM_REGION
-	select CACHE_MRC_SETTINGS
+	select CACHE_MRC_SETTINGS if HAVE_MRC
 	select CPU_INTEL_TURBO_NOT_PACKAGE_SCOPED
 	select SUPPORT_CPU_UCODE_IN_CBFS
 	select HAVE_SMI_HANDLER
diff --git a/src/soc/intel/braswell/Kconfig b/src/soc/intel/braswell/Kconfig
index 4f7ed6a..07a1bf6 100644
--- a/src/soc/intel/braswell/Kconfig
+++ b/src/soc/intel/braswell/Kconfig
@@ -12,7 +12,7 @@ config CPU_SPECIFIC_OPTIONS
 	select ARCH_ROMSTAGE_X86_32
 	select ARCH_VERSTAGE_X86_32
 	select BACKUP_DEFAULT_SMM_REGION
-	select CACHE_MRC_SETTINGS
+	select CACHE_MRC_SETTINGS if HAVE_MRC
 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select COLLECT_TIMESTAMPS
 	select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig
index 524366c..7009b2f 100644
--- a/src/soc/intel/broadwell/Kconfig
+++ b/src/soc/intel/broadwell/Kconfig
@@ -14,7 +14,7 @@ config CPU_SPECIFIC_OPTIONS
 	select VGA_ROM_RUN if !PAYLOAD_SEABIOS
 	select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
 	select BACKUP_DEFAULT_SMM_REGION
-	select CACHE_MRC_SETTINGS
+	select CACHE_MRC_SETTINGS if HAVE_MRC
 	select MRC_SETTINGS_PROTECT
 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index f42d3ab..638d176 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -14,7 +14,7 @@ config CPU_SPECIFIC_OPTIONS
 	select VGA_ROM_RUN if !PAYLOAD_SEABIOS
 	select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
 	select BACKUP_DEFAULT_SMM_REGION
-	select CACHE_MRC_SETTINGS
+	select CACHE_MRC_SETTINGS if HAVE_MRC
 	select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
 	select CACHE_ROM
 	select CAR_MIGRATION