Patch set updated for coreboot: a9f436f Drop config variable CPU_MODEL_INDEX

[Stefan Reinauer]

Stefan Reinauer ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1047

-gerrit

commit a9f436fa6f13d46f9d4a2b9f4f849a3f828ab5cd
Author: Stefan Reinauer 
Date:   Fri May 11 16:30:54 2012 -0700

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 
---
 src/cpu/intel/model_206ax/Kconfig |    8 --------
 src/cpu/intel/model_206ax/acpi.c  |   11 ++---------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index c11f21a..d2d4c73 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 1a8ceb7..6153174 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;
 }