GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Intel: Remove CACHE_MRC_BIN - 'selected' everywhere in Kconfig 

The Kconfig symbol CACHE_MRC_BIN was getting forced enabled everywhere
it existed.

Remove the Kconfig symbol and get rid of the #if statements
surrounding the code.

This fixes the Kconfig warning for Haswell & Broadwell chips:
warning: (NORTHBRIDGE_INTEL_HASWELL &&
NORTHBRIDGE_INTEL_SANDYBRIDGE &&
NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE &&
NORTHBRIDGE_INTEL_IVYBRIDGE &&
NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE &&
CPU_SPECIFIC_OPTIONS) selects CACHE_MRC_BIN
which has unmet direct dependencies
(CPU_INTEL_SOCKET_RPGA988B || CPU_INTEL_SOCKET_RPGA989)

Change-Id: Ie0f0726e3d6f217e2cb3be73034405081ce0735a
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: http://review.coreboot.org/11270
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Martin Roth 2015-08-18 10:41:54 -06:00
parent 1fff0d26f8
commit df205067c9
8 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cpu/intel/haswell/cache_as_ram.inc
View File

@ -151,7 +151,6 @@ clear_mtrrs:
wrmsr wrmsr
post_code(0x27) post_code(0x27)
#if CONFIG_CACHE_MRC_BIN
/* Enable caching for ram init code to run faster */ /* Enable caching for ram init code to run faster */
movl $MTRRphysBase_MSR(2), %ecx movl $MTRRphysBase_MSR(2), %ecx
movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax
@ -161,7 +160,6 @@ clear_mtrrs:
movl $(CACHE_MRC_MASK | MTRRphysMaskValid), %eax movl $(CACHE_MRC_MASK | MTRRphysMaskValid), %eax
movl $CPU_PHYSMASK_HI, %edx movl $CPU_PHYSMASK_HI, %edx
wrmsr wrmsr
#endif
post_code(0x28) post_code(0x28)
/* Enable cache. */ /* Enable cache. */
@ -219,7 +217,6 @@ before_romstage:
andl $~1, %eax andl $~1, %eax
wrmsr wrmsr
#if CONFIG_CACHE_MRC_BIN
/* Clear MTRR that was used to cache MRC */ /* Clear MTRR that was used to cache MRC */
xorl %eax, %eax xorl %eax, %eax
xorl %edx, %edx xorl %edx, %edx
@ -227,7 +224,6 @@ before_romstage:
wrmsr wrmsr
movl $MTRRphysMask_MSR(2), %ecx movl $MTRRphysMask_MSR(2), %ecx
wrmsr wrmsr
#endif
post_code(0x33) post_code(0x33)

4
src/cpu/intel/model_206ax/cache_as_ram.inc
View File

@ -146,7 +146,6 @@ clear_mtrrs:
wrmsr wrmsr
post_code(0x27) post_code(0x27)
#if CONFIG_CACHE_MRC_BIN
/* Enable caching for ram init code to run faster */ /* Enable caching for ram init code to run faster */
movl $MTRRphysBase_MSR(2), %ecx movl $MTRRphysBase_MSR(2), %ecx
movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax
@ -156,7 +155,6 @@ clear_mtrrs:
movl $(CACHE_MRC_MASK | MTRRphysMaskValid), %eax movl $(CACHE_MRC_MASK | MTRRphysMaskValid), %eax
movl $CPU_PHYSMASK_HI, %edx movl $CPU_PHYSMASK_HI, %edx
wrmsr wrmsr
#endif
post_code(0x28) post_code(0x28)
/* Enable cache. */ /* Enable cache. */
@ -211,7 +209,6 @@ before_romstage:
andl $~1, %eax andl $~1, %eax
wrmsr wrmsr
#if CONFIG_CACHE_MRC_BIN
/* Clear MTRR that was used to cache MRC */ /* Clear MTRR that was used to cache MRC */
xorl %eax, %eax xorl %eax, %eax
xorl %edx, %edx xorl %edx, %edx
@ -219,7 +216,6 @@ before_romstage:
wrmsr wrmsr
movl $MTRRphysMask_MSR(2), %ecx movl $MTRRphysMask_MSR(2), %ecx
wrmsr wrmsr
#endif
post_code(0x33) post_code(0x33)

4
src/cpu/intel/socket_rPGA988B/Kconfig
View File

@ -8,8 +8,4 @@ config SOCKET_SPECIFIC_OPTIONS # dummy
select MMX select MMX
select SSE select SSE
config CACHE_MRC_BIN
bool
default n
endif endif

4
src/cpu/intel/socket_rPGA989/Kconfig
View File

@ -8,8 +8,4 @@ config SOCKET_SPECIFIC_OPTIONS # dummy
select MMX select MMX
select SSE select SSE
config CACHE_MRC_BIN
bool
default n
endif endif

1
src/northbridge/intel/haswell/Kconfig
View File

@ -19,7 +19,6 @@
config NORTHBRIDGE_INTEL_HASWELL config NORTHBRIDGE_INTEL_HASWELL
bool bool
select CACHE_MRC_BIN
select CPU_INTEL_HASWELL select CPU_INTEL_HASWELL
select MMCONF_SUPPORT select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT

4
src/northbridge/intel/sandybridge/Kconfig
View File

@ -19,7 +19,6 @@
config NORTHBRIDGE_INTEL_SANDYBRIDGE config NORTHBRIDGE_INTEL_SANDYBRIDGE
bool bool
select CACHE_MRC_BIN
select MMCONF_SUPPORT select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select CPU_INTEL_MODEL_206AX select CPU_INTEL_MODEL_206AX
@ -27,7 +26,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE
config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE
bool bool
select CACHE_MRC_BIN
select MMCONF_SUPPORT select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select CPU_INTEL_MODEL_206AX select CPU_INTEL_MODEL_206AX
@ -36,7 +34,6 @@ config NORTHBRIDGE_INTEL_SANDYBRIDGE_NATIVE
config NORTHBRIDGE_INTEL_IVYBRIDGE config NORTHBRIDGE_INTEL_IVYBRIDGE
bool bool
select CACHE_MRC_BIN
select MMCONF_SUPPORT select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select CPU_INTEL_MODEL_306AX select CPU_INTEL_MODEL_306AX
@ -44,7 +41,6 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE
config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE config NORTHBRIDGE_INTEL_IVYBRIDGE_NATIVE
bool bool
select CACHE_MRC_BIN
select MMCONF_SUPPORT select MMCONF_SUPPORT
select MMCONF_SUPPORT_DEFAULT select MMCONF_SUPPORT_DEFAULT
select CPU_INTEL_MODEL_306AX select CPU_INTEL_MODEL_306AX

1
src/soc/intel/broadwell/Kconfig
View File

@ -14,7 +14,6 @@ config CPU_SPECIFIC_OPTIONS
select VGA_ROM_RUN if !PAYLOAD_SEABIOS select VGA_ROM_RUN if !PAYLOAD_SEABIOS
select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS select ALWAYS_LOAD_OPROM if !PAYLOAD_SEABIOS
select BACKUP_DEFAULT_SMM_REGION select BACKUP_DEFAULT_SMM_REGION
select CACHE_MRC_BIN
select CACHE_MRC_SETTINGS select CACHE_MRC_SETTINGS
select MRC_SETTINGS_PROTECT select MRC_SETTINGS_PROTECT
select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM select CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM

4
src/soc/intel/broadwell/romstage/cache_as_ram.inc
View File

@ -153,7 +153,6 @@ clear_mtrrs:
wrmsr wrmsr
post_code(0x27) post_code(0x27)
#if CONFIG_CACHE_MRC_BIN
/* Enable caching for ram init code to run faster */ /* Enable caching for ram init code to run faster */
movl $MTRRphysBase_MSR(2), %ecx movl $MTRRphysBase_MSR(2), %ecx
movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax movl $(CACHE_MRC_BASE | MTRR_TYPE_WRPROT), %eax
@ -163,7 +162,6 @@ clear_mtrrs:
movl $(CACHE_MRC_MASK | MTRRphysMaskValid), %eax movl $(CACHE_MRC_MASK | MTRRphysMaskValid), %eax
movl $CPU_PHYSMASK_HI, %edx movl $CPU_PHYSMASK_HI, %edx
wrmsr wrmsr
#endif
post_code(0x28) post_code(0x28)
/* Enable cache. */ /* Enable cache. */
@ -239,7 +237,6 @@ before_romstage:
andl $~1, %eax andl $~1, %eax
wrmsr wrmsr
#if CONFIG_CACHE_MRC_BIN
/* Clear MTRR that was used to cache MRC */ /* Clear MTRR that was used to cache MRC */
xorl %eax, %eax xorl %eax, %eax
xorl %edx, %edx xorl %edx, %edx
@ -247,7 +244,6 @@ before_romstage:
wrmsr wrmsr
movl $MTRRphysMask_MSR(2), %ecx movl $MTRRphysMask_MSR(2), %ecx
wrmsr wrmsr
#endif
post_code(0x33) post_code(0x33)