summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2012-07-10 17:13:04 -0700
committerPatrick Georgi <patrick@georgi-clan.de>2012-07-26 11:12:53 +0200
commit0b7b7b6334de592b82d36ee47bc25b1b72043681 (patch)
treed852a2e92705f31d62d1a241c7a29580e3ad073e
parentc65a36eb0f097ca13cdab8a787ce5cf35f49a64f (diff)
downloadcoreboot-0b7b7b6334de592b82d36ee47bc25b1b72043681.tar.xz
Drop CONFIG_CPU_MODEL_NAME and fix CPU name displayed in logs
On SandyBridge systems configured to work with Panther Point the CPU would wrongly be described as IvyBridge. Fix this issue and drop an unneeded Kconfig variable at the same time. Change-Id: I501a4fa00613e589cd315cfee61b2f9561dfcb4d Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/1335 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
-rw-r--r--src/cpu/intel/model_206ax/Kconfig12
-rw-r--r--src/cpu/intel/model_206ax/acpi.c2
2 files changed, 1 insertions, 13 deletions
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index 071683ea0f..effcdd1bd5 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -26,15 +26,3 @@ config MICROCODE_INCLUDE_PATH
string
default "src/cpu/intel/model_206ax"
endif
-
-if CPU_INTEL_MODEL_206AX
- config CPU_MODEL_NAME
- string
- default "Intel SandyBridge CPU"
-endif
-
-if CPU_INTEL_MODEL_306AX
- config CPU_MODEL_NAME
- string
- default "Intel IvyBridge CPU"
-endif
diff --git a/src/cpu/intel/model_206ax/acpi.c b/src/cpu/intel/model_206ax/acpi.c
index 7b495558d4..9784c4771f 100644
--- a/src/cpu/intel/model_206ax/acpi.c
+++ b/src/cpu/intel/model_206ax/acpi.c
@@ -362,5 +362,5 @@ void generate_cpu_entries(void)
}
struct chip_operations cpu_intel_model_206ax_ops = {
- CHIP_NAME(CONFIG_CPU_MODEL_NAME)
+ CHIP_NAME("Intel SandyBridge/IvyBridge CPU")
};