summaryrefslogtreecommitdiff
path: root/src/boot/hardwaremain.c
diff options
context:
space:
mode:
authorEric Biederman <ebiederm@xmission.com>2003-07-19 04:28:22 +0000
committerEric Biederman <ebiederm@xmission.com>2003-07-19 04:28:22 +0000
commit9b4336cf418d22551bea09d93e1cee79281b110e (patch)
tree3f1e24216c11918644a98fd1e46e2fdb40fd12fe /src/boot/hardwaremain.c
parentfe4414587a4466b848184b8837d4c5a280949824 (diff)
- Major cleanup of the bootpath
- Changes to allow more code to be compiled both ways - Working SMP support git-svn-id: svn://svn.coreboot.org/coreboot/trunk@987 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/boot/hardwaremain.c')
-rw-r--r--src/boot/hardwaremain.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index 4e7b9e379e..1443727948 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -35,6 +35,7 @@ it with the version available from LANL.
#include <part/sizeram.h>
#include <device/device.h>
#include <device/pci.h>
+#include <delay.h>
#if 0
#include <part/mainboard.h>
#endif
@@ -74,7 +75,7 @@ static struct mem_range *get_ramsize(void)
}
-#if SMP == 1
+#if CONFIG_SMP == 1
/* Number of cpus that are currently running in linuxbios */
static atomic_t active_cpus = ATOMIC_INIT(1);
@@ -111,10 +112,9 @@ static void wait_for_other_cpus(void)
}
for(i = 0; i < MAX_CPUS; i++) {
if (!(processor_map[i] & CPU_ENABLED)) {
- printk_err("CPU %d/%u did not initialize!\n",
- i, initial_apicid[i]);
+ printk_err("CPU %d did not initialize!\n", i);
processor_map[i] = 0;
- mainboard_cpu_fixup(i);
+#warning "FIXME do I need a mainboard_cpu_fixup function?"
}
}
printk_debug("All AP CPUs stopped\n");
@@ -159,7 +159,7 @@ void hardwaremain(int boot_complete)
hard_reset();
}
#endif
-#if 1
+ init_timer();
/* pick how to scan the bus. This is first so we can get at memory size. */
printk_info("Finding PCI configuration type.\n");
@@ -181,7 +181,6 @@ void hardwaremain(int boot_complete)
dev_initialize();
post_code(0x89);
-#endif
mem = get_ramsize();
post_code(0x70);