summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/hardwaremain.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index 4bb23fde80..ff0909fd97 100644
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -166,7 +166,7 @@ void hardwaremain(int boot_complete)
hard_reset();
}
#endif
- init_timer();
+ init_timer(); /* needs to be moved into static configuration */
CONFIGURE(CONF_PASS_PRE_PCI);
/* pick how to scan the bus. This is first so we can get at memory size. */
@@ -190,6 +190,8 @@ void hardwaremain(int boot_complete)
dev_initialize();
post_code(0x89);
+ CONFIGURE(CONF_PASS_POST_PCI);
+
mem = get_ramsize();
post_code(0x70);
totalmem = 0;
@@ -220,7 +222,7 @@ void hardwaremain(int boot_complete)
*/
lb_mem = write_tables(mem, processor_map);
- CONFIGURE(CONF_PASS_PRE_PCI);
+ CONFIGURE(CONF_PASS_PRE_BOOT);
elfboot(lb_mem);
}