summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-11-25 17:46:08 -0800
committerBin Meng <bmeng.cn@gmail.com>2015-12-09 17:44:54 +0800
commitd475d59020af32bd5b55ca48a5bc73213e53a7c8 (patch)
treed487ae4cb2ffcdf81d22e337ecf1c1970c513dc8
parentefe2d80cca4822ce6c435993e01467eeee8babfb (diff)
downloadu-boot-imx-d475d59020af32bd5b55ca48a5bc73213e53a7c8.zip
u-boot-imx-d475d59020af32bd5b55ca48a5bc73213e53a7c8.tar.gz
u-boot-imx-d475d59020af32bd5b55ca48a5bc73213e53a7c8.tar.bz2
x86: Remove CPU_INTEL_SOCKET_RPGA989
This Kconfig option name indicates it has something to do with cpu socket, however it is actually not the case. Remove it and move options inside it to NORTHBRIDGE_INTEL_IVYBRIDGE. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org> Tested-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/x86/cpu/ivybridge/Kconfig15
-rw-r--r--board/google/chromebook_link/Kconfig1
-rw-r--r--board/google/chromebox_panther/Kconfig1
3 files changed, 4 insertions, 13 deletions
diff --git a/arch/x86/cpu/ivybridge/Kconfig b/arch/x86/cpu/ivybridge/Kconfig
index 0970382..56abd8f 100644
--- 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
@@ -69,14 +73,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
diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig
index 3843517..ce976db 100644
--- a/board/google/chromebook_link/Kconfig
+++ b/board/google/chromebook_link/Kconfig
@@ -18,7 +18,6 @@ config SYS_TEXT_BASE
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select X86_RESET_VECTOR
- select CPU_INTEL_SOCKET_RPGA989
select NORTHBRIDGE_INTEL_IVYBRIDGE
select HAVE_ACPI_RESUME
select BOARD_ROMSIZE_KB_8192
diff --git a/board/google/chromebox_panther/Kconfig b/board/google/chromebox_panther/Kconfig
index 88afff3..c1cf89c 100644
--- a/board/google/chromebox_panther/Kconfig
+++ b/board/google/chromebox_panther/Kconfig
@@ -19,7 +19,6 @@ config SYS_TEXT_BASE
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select X86_RESET_VECTOR
- select CPU_INTEL_SOCKET_RPGA989
select NORTHBRIDGE_INTEL_IVYBRIDGE
select HAVE_ACPI_RESUME
select BOARD_ROMSIZE_KB_8192