summaryrefslogtreecommitdiff
path: root/src/boot
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/hardwaremain.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index 0477253ec4..4bb23fde80 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 <device/chip.h>
#include <delay.h>
#if 0
#include <part/mainboard.h>
@@ -146,6 +147,9 @@ void hardwaremain(int boot_complete)
unsigned long totalmem;
post_code(0x80);
+
+ CONFIGURE(CONF_PASS_PRE_CONSOLE);
+
/* displayinit MUST PRECEDE ALL PRINTK! */
console_init();
@@ -163,6 +167,7 @@ void hardwaremain(int boot_complete)
}
#endif
init_timer();
+ CONFIGURE(CONF_PASS_PRE_PCI);
/* pick how to scan the bus. This is first so we can get at memory size. */
printk_info("Finding PCI configuration type.\n");
@@ -215,6 +220,8 @@ void hardwaremain(int boot_complete)
*/
lb_mem = write_tables(mem, processor_map);
+ CONFIGURE(CONF_PASS_PRE_PCI);
+
elfboot(lb_mem);
}