[coreboot] New patch to review for coreboot: 8de89aa Drop CONFIG_CPU_MODEL_NAME and fix CPU name displayed in logs

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1335

-gerrit

commit 8de89aa8148c36dd405839458e59886b8973e5d6
Author: Stefan Reinauer <reinauer at chromium.org>
Date:   Tue Jul 10 17:13:04 2012 -0700

    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 at google.com>
---
 src/cpu/intel/model_206ax/Kconfig |   12 ------------
 src/cpu/intel/model_206ax/acpi.c  |    2 +-
 2 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index 071683e..effcdd1 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 7b49555..9784c47 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")
 };