diff options
| author | arch import user (historical) <svn@openbios.org> | 2005-07-06 17:15:54 +0000 |
|---|---|---|
| committer | arch import user (historical) <svn@openbios.org> | 2005-07-06 17:15:54 +0000 |
| commit | 1c8cd59f3c9248f0954a5cf215dc3652ccfc8da5 (patch) | |
| tree | 7c19d8a922e2d0613a494c5949b2b6f45c388e13 /src/mainboard/ibm | |
| parent | 7e5fbd6fc03df87c9276b08219ca15ad17c43dac (diff) | |
| download | coreboot-1c8cd59f3c9248f0954a5cf215dc3652ccfc8da5.tar.xz | |
Revision: linuxbios@linuxbios.org--devel/freebios--devel--2.0--patch-38
Creator: Li-Ta Lo <ollie@lanl.gov>
emulator update
x96emu update from Paulo
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1954 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/ibm')
| -rw-r--r-- | src/mainboard/ibm/e325/auto.c | 9 | ||||
| -rw-r--r-- | src/mainboard/ibm/e325/failover.c | 5 |
2 files changed, 3 insertions, 11 deletions
diff --git a/src/mainboard/ibm/e325/auto.c b/src/mainboard/ibm/e325/auto.c index b1c9e772d5..dbbcbf597b 100644 --- a/src/mainboard/ibm/e325/auto.c +++ b/src/mainboard/ibm/e325/auto.c @@ -158,21 +158,16 @@ 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)) { + if (cpu_init_detected()) { asm volatile ("jmp __cpu_reset"); } - distinguish_cpu_resets(nodeid); + distinguish_cpu_resets(); if (!boot_cpu()) { stop_this_cpu(); } diff --git a/src/mainboard/ibm/e325/failover.c b/src/mainboard/ibm/e325/failover.c index ed5ce32d81..e351cae83d 100644 --- a/src/mainboard/ibm/e325/failover.c +++ b/src/mainboard/ibm/e325/failover.c @@ -13,14 +13,11 @@ static unsigned long main(unsigned long bist) { - unsigned nodeid; /* Make cerain my local apic is useable */ enable_lapic(); - nodeid = lapicid() & 0xf; - /* Is this a cpu only reset? */ - if (cpu_init_detected(nodeid)) { + if (cpu_init_detected()) { if (last_boot_normal()) { goto normal_image; } else { |