[coreboot] [v2] r4858 - trunk/coreboot-v2/src/mainboard/intel/eagleheights

[svn at coreboot.org]

Author: stepan
Date: 2009-10-26 17:48:27 +0100 (Mon, 26 Oct 2009)
New Revision: 4858

Modified:
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc
   trunk/coreboot-v2/src/mainboard/intel/eagleheights/auto.c
Log:
Use Intel Core code for eagleheights CAR init, not Intel Core 2, as
any of the CPUs might be used.

Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Peter Stuge <peter at stuge.se>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>


Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb	2009-10-26 16:47:05 UTC (rev 4857)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Config.lb	2009-10-26 16:48:27 UTC (rev 4858)
@@ -109,7 +109,8 @@
 ##
 ## Setup Cache-As-Ram
 ##
-mainboardinit cpu/intel/model_6fx/cache_as_ram.inc
+## Use Intel Core (not Core 2) code for CAR init, any CPU might be used.
+mainboardinit cpu/intel/model_6ex/cache_as_ram.inc
 
 ###
 ### This is the early phase of coreboot startup

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc	2009-10-26 16:47:05 UTC (rev 4857)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/Makefile.inc	2009-10-26 16:48:27 UTC (rev 4858)
@@ -14,6 +14,7 @@
 crt0-y += ../../../../src/cpu/x86/32bit/entry32.inc
 crt0-y += ../../../../src/cpu/x86/16bit/reset16.inc
 crt0-y += ../../../../src/arch/i386/lib/id.inc
+# Use Intel Core (not Core 2) code for CAR init, any CPU might be used.
 crt0-y += ../../../../src/cpu/intel/model_6ex/cache_as_ram.inc
 crt0-y += auto.inc
 

Modified: trunk/coreboot-v2/src/mainboard/intel/eagleheights/auto.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/eagleheights/auto.c	2009-10-26 16:47:05 UTC (rev 4857)
+++ trunk/coreboot-v2/src/mainboard/intel/eagleheights/auto.c	2009-10-26 16:48:27 UTC (rev 4858)
@@ -238,4 +238,5 @@
 	sdram_initialize(ARRAY_SIZE(mch), mch);
 }
 
-#include "cpu/intel/model_6fx/cache_as_ram_disable.c"
+/* Use Intel Core (not Core 2) code for CAR init, any CPU might be used. */
+#include "cpu/intel/model_6ex/cache_as_ram_disable.c"