x86: ivybridge: Do not require HAVE_INTEL_ME

Do not set HAVE_INTEL_ME by default as for some cases Intel ME
firmware even does not reside on the same SPI flash as U-Boot.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig
index 56abd8fae3556a9b531656a5baf310dd4f97a16e..1768a26a35293cb840cfb54f5565c174ef65d1a0 100644 (file)
--- a/arch/x86/cpu/ivybridge/Kconfig
+++ b/arch/x86/cpu/ivybridge/Kconfig
@@ -48,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

diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig
index 6b139392b56dd40e65a5f01d5f7de9606ce92737..fa12f338de584416d28e404a2f2dff5e28fad408 100644 (file)
--- a/board/google/chromebook_link/Kconfig
+++ b/board/google/chromebook_link/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_RESET_VECTOR
        select NORTHBRIDGE_INTEL_IVYBRIDGE
+       select HAVE_INTEL_ME
        select BOARD_ROMSIZE_KB_8192
 
 config PCIE_ECAM_BASE

diff --git a/board/google/chromebox_panther/Kconfig b/board/google/chromebox_panther/Kconfig
index ae96d23d0306a40228842aeca22b347b90169927..2af3aa9e74ab73e48ebce3aa82c14a465284928f 100644 (file)
--- a/board/google/chromebox_panther/Kconfig
+++ b/board/google/chromebox_panther/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_RESET_VECTOR
        select NORTHBRIDGE_INTEL_IVYBRIDGE
+       select HAVE_INTEL_ME
        select BOARD_ROMSIZE_KB_8192
 
 config SYS_CAR_ADDR