summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2012-05-11 16:30:54 -0700
committerPatrick Georgi <patrick@georgi-clan.de>2012-05-29 19:55:42 +0200
commitbb31f3a24ac0cf5bcc9f5342733de7fbc09299e2 (patch)
tree884c443077f11890ff9c6c77a7df71d1b528137a
parent14b23a6ca60728520ddac91cdbe840919618d7b8 (diff)
downloadcoreboot-bb31f3a24ac0cf5bcc9f5342733de7fbc09299e2.tar.xz
Drop config variable CPU_MODEL_INDEX
It's only used in the ACPI generator for Sandybridge/Ivybridge CPUs and the code can easily be changed to not rely on any Kconfig magic. Change-Id: Ie2f92edfe8908f7eb2fda3088f77ad22f491ddcf Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/1047 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--src/cpu/intel/model_206ax/Kconfig8
-rw-r--r--src/cpu/intel/model_206ax/acpi.c11
2 files changed, 2 insertions, 17 deletions
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index c11f21ad65..d2d4c73785 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -36,18 +36,10 @@ if CPU_INTEL_MODEL_206AX
config CPU_MODEL_NAME
string
default "Intel SandyBridge CPU"
-
- config CPU_MODEL_INDEX
- hex
- default 0x2a
endif
if CPU_INTEL_MODEL_306AX
config CPU_MODEL_NAME
string
default "Intel IvyBridge CPU"
-
- config CPU_MODEL_INDEX
- hex
- default 0x3a
endif
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index 1a8ceb719c..6153174689 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -44,15 +44,8 @@ static int get_cores_per_package(void)
if (c.x86 != 6)
return 1;
- switch (c.x86_model) {
- case CONFIG_CPU_MODEL_INDEX:
- result = cpuid_ext(0xb, 1);
- cores = result.ebx & 0xff;
- break;
- default:
- cores = (cpuid_ebx(1) >> 16) & 0xff;
- break;
- }
+ result = cpuid_ext(0xb, 1);
+ cores = result.ebx & 0xff;
return cores;
}