Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-34

Creator:  Yinghai Lu <yhlu@tyan.com>

AMD D0/E0 Opteron new mem mapping support, AMD E Opteron mem hole support,AMD K8 Four Ranks DIMM support


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1950 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 23 insertions, 7 deletions

diff --git a/src/mainboard/tyan/s2885/failover.c b/src/mainboard/tyan/s2885/failover.c
index 45315521ac..345d3f4d1a 100644
--- a/src/mainboard/tyan/s2885/failover.c
+++ b/src/mainboard/tyan/s2885/failover.c
@@ -11,16 +11,33 @@
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "northbridge/amd/amdk8/reset_test.c"
 
+#if CONFIG_LOGICAL_CPUS==1
+#include "cpu/amd/dualcore/dualcore_id.c"
+#else
+#include "cpu/amd/model_fxx/node_id.c"
+#endif
+
 static unsigned long main(unsigned long bist)
 {
-        unsigned nodeid;
-        /* Make cerain my local apic is useable */
-        enable_lapic();
-
-        nodeid = lapicid() & 0xf;
+#if CONFIG_LOGICAL_CPUS==1
+        struct node_core_id id;
+#else
+	unsigned nodeid;
+#endif	
+	/* Make cerain my local apic is useable */
+//	enable_lapic();
 
+#if CONFIG_LOGICAL_CPUS==1
+        id = get_node_core_id_x();
+	/* Is this a cpu only reset? */
+        if (cpu_init_detected(id.nodeid)) {
+#else
+//        nodeid = lapicid() & 0xf;
+	nodeid = get_node_id();
+	/* Is this a cpu only reset? */
+        if (cpu_init_detected(nodeid)) {
+#endif
 	/* Is this a cpu only reset? */
-	if (cpu_init_detected(nodeid)) {
 		if (last_boot_normal()) {
 			goto normal_image;
 		} else {
@@ -36,7 +53,6 @@ static unsigned long main(unsigned long bist)
 		}
 	}
 	
-
 	/* Nothing special needs to be done to find bus 0 */
 	/* Allow the HT devices to be found */
 	enumerate_ht_chain();