From 7003ba4a88a847707c55d593e517eaa70fc8c63d Mon Sep 17 00:00:00 2001 From: Eric Biederman Date: Sat, 16 Oct 2004 06:20:29 +0000 Subject: - First stab at running linuxbios without the old static device tree. Things are close but not quite there yet. git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1681 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/boot/hardwaremain.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/boot/hardwaremain.c') diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c index d292e5dcd4..ecff677c88 100644 --- a/src/boot/hardwaremain.c +++ b/src/boot/hardwaremain.c @@ -32,7 +32,6 @@ it with the version available from LANL. #include #include #include -#include #include #include #include @@ -52,8 +51,6 @@ void hardwaremain(int boot_complete) post_code(0x80); - CONFIGURE(CONF_PASS_PRE_CONSOLE); - /* displayinit MUST PRECEDE ALL PRINTK! */ console_init(); @@ -69,13 +66,13 @@ void hardwaremain(int boot_complete) hard_reset(); } - CONFIGURE(CONF_PASS_PRE_PCI); + /* FIXME: Is there a better way to handle this? */ + 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"); pci_set_method(); post_code(0x5f); - enumerate_static_devices(); dev_enumerate(); post_code(0x66); /* Now do the real bus. @@ -90,15 +87,11 @@ void hardwaremain(int boot_complete) dev_initialize(); post_code(0x89); - CONFIGURE(CONF_PASS_POST_PCI); - /* Now that we have collected all of our information * write our configuration tables. */ lb_mem = write_tables(); - CONFIGURE(CONF_PASS_PRE_BOOT); - #if CONFIG_FS_STREAM == 1 filo(lb_mem); #else -- cgit v1.2.3