GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Stefan Reinauer 2012-05-11 16:30:54 -07:00 committed by Patrick Georgi
parent 14b23a6ca6
commit bb31f3a24a
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cpu/intel/model_206ax/Kconfig
View File

@ -36,18 +36,10 @@ if CPU_INTEL_MODEL_206AX
config CPU_MODEL_NAME config CPU_MODEL_NAME
string string
default "Intel SandyBridge CPU" default "Intel SandyBridge CPU"
config CPU_MODEL_INDEX
hex
default 0x2a
endif endif
if CPU_INTEL_MODEL_306AX if CPU_INTEL_MODEL_306AX
config CPU_MODEL_NAME config CPU_MODEL_NAME
string string
default "Intel IvyBridge CPU" default "Intel IvyBridge CPU"
config CPU_MODEL_INDEX
hex
default 0x3a
endif endif

11
src/cpu/intel/model_206ax/acpi.c
View File

@ -44,15 +44,8 @@ static int get_cores_per_package(void)
if (c.x86 != 6) if (c.x86 != 6)
return 1; return 1;
switch (c.x86_model) { result = cpuid_ext(0xb, 1);
case CONFIG_CPU_MODEL_INDEX: cores = result.ebx & 0xff;
result = cpuid_ext(0xb, 1);
cores = result.ebx & 0xff;
break;
default:
cores = (cpuid_ebx(1) >> 16) & 0xff;
break;
}
return cores; return cores;
} }