Merge branch 'master' of git://git.denx.de/u-boot-i2c; branch 'master' of git://git...

[u-boot] / arch / x86 / cpu / ivybridge / Kconfig

diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig
index 09703822d9931457967c9fe4f9207d891cfecc79..1768a26a35293cb840cfb54f5565c174ef65d1a0 100644 (file)
--- a/arch/x86/cpu/ivybridge/Kconfig
+++ b/arch/x86/cpu/ivybridge/Kconfig
@@ -11,6 +11,10 @@ config NORTHBRIDGE_INTEL_IVYBRIDGE
 
 if NORTHBRIDGE_INTEL_IVYBRIDGE
 
+config CACHE_MRC_BIN
+       bool
+       default n
+
 config CACHE_MRC_SIZE_KB
        int
        default 512
@@ -44,7 +48,6 @@ config DCACHE_RAM_MRC_VAR_SIZE
 config CPU_SPECIFIC_OPTIONS
        def_bool y
        select SMM_TSEG
-       select HAVE_INTEL_ME
        select X86_RAMTEST
 
 config SMM_TSEG_SIZE
@@ -69,14 +72,3 @@ config ENABLE_VMX
          slowly.
 
 endif
-
-config CPU_INTEL_SOCKET_RPGA989
-       bool
-
-if CPU_INTEL_SOCKET_RPGA989
-
-config CACHE_MRC_BIN
-       bool
-       default n
-
-endif