From fddf46f275f27b20a05ff761c4e267fd619e9664 Mon Sep 17 00:00:00 2001 From: Jason Schildt Date: Tue, 25 Oct 2005 21:45:17 +0000 Subject: - See Issue Tracker id-12 "lnxi-patch-12". git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2076 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/mainboard/amd/quartet/auto.c | 17 ++--------------- src/mainboard/amd/serenade/auto.c | 16 ++-------------- src/mainboard/amd/solo/auto.c | 20 ++------------------ 3 files changed, 6 insertions(+), 47 deletions(-) (limited to 'src/mainboard/amd') diff --git a/src/mainboard/amd/quartet/auto.c b/src/mainboard/amd/quartet/auto.c index 638d09b861..6ab2ea8208 100644 --- a/src/mainboard/amd/quartet/auto.c +++ b/src/mainboard/amd/quartet/auto.c @@ -26,6 +26,7 @@ #include "superio/NSC/pc87360/pc87360_early_serial.c" #include "cpu/amd/mtrr/amd_earlymtrr.c" #include "cpu/x86/bist.h" +#include "cpu/amd/dualcore/dualcore.c" #define SERIAL_DEV PNP_DEV(0x2e, PC87360_SP1) @@ -212,21 +213,7 @@ static void main(unsigned long bist) unsigned nodeid; if (bist == 0) { - /* Skip this if there was a built in self test failure */ - amd_early_mtrr_init(); - enable_lapic(); - init_timer(); - nodeid = lapicid() & 0xf; - /* Has this cpu already booted? */ - if (cpu_init_detected(nodeid)) { - asm volatile ("jmp __cpu_reset"); - } - - distinguish_cpu_resets(nodeid); - - if (!boot_cpu()) { - stop_this_cpu(); - } + k8_init_and_stop_secondaries(); } /* Setup the console */ pc87360_enable_serial(SERIAL_DEV, TTYS0_BASE); diff --git a/src/mainboard/amd/serenade/auto.c b/src/mainboard/amd/serenade/auto.c index 9a9de15b49..f1104bdb86 100644 --- a/src/mainboard/amd/serenade/auto.c +++ b/src/mainboard/amd/serenade/auto.c @@ -25,6 +25,7 @@ #include "superio/winbond/w83627hf/w83627hf_early_serial.c" #include "cpu/amd/mtrr/amd_earlymtrr.c" #include "cpu/x86/bist.h" +#include "cpu/amd/dualcore/dualcore.c" #define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) @@ -163,20 +164,7 @@ static void main(unsigned long bist) int needs_reset; unsigned nodeid; if (bist == 0) { - /* Skip this if there was a built in self test failure */ - amd_early_mtrr_init(); - enable_lapic(); - init_timer(); - nodeid = lapicid() & 0xf; - /* Has this cpu already booted? */ - if (cpu_init_detected(nodeid)) { - asm volatile ("jmp __cpu_reset"); - } - - distinguish_cpu_resets(nodeid); - if (!boot_cpu()) { - stop_this_cpu(); - } + k8_init_and_stop_secondaries(); } /* Setup the console */ w83627hf_enable_serial(SERIAL_DEV, TTYS0_BASE); diff --git a/src/mainboard/amd/solo/auto.c b/src/mainboard/amd/solo/auto.c index fff604dc35..a9d2404f69 100644 --- a/src/mainboard/amd/solo/auto.c +++ b/src/mainboard/amd/solo/auto.c @@ -23,6 +23,7 @@ #include "superio/NSC/pc87360/pc87360_early_serial.c" #include "cpu/amd/mtrr/amd_earlymtrr.c" #include "cpu/x86/bist.h" +#include "cpu/amd/dualcore/dualcore.c" #define SERIAL_DEV PNP_DEV(0x2e, PC87360_SP1) @@ -111,24 +112,7 @@ static void main(unsigned long bist) unsigned nodeid; if (bist == 0) { - /* Skip this if there was a built in self test failure */ - amd_early_mtrr_init(); - - enable_lapic(); - init_timer(); - - nodeid = lapicid() & 0xf; - - if (cpu_init_detected(nodeid)) { - asm volatile ("jmp __cpu_reset"); - } - - distinguish_cpu_resets(nodeid); - - if (!boot_cpu()) { - /* This LinuxBIOS image is built for UP only */ - stop_this_cpu(); - } + k8_init_and_stop_secondaries(); } /* Setup the console */ -- cgit v1.2.3