diff options
| author | Eric Biederman <ebiederm@xmission.com> | 2004-10-16 06:20:29 +0000 |
|---|---|---|
| committer | Eric Biederman <ebiederm@xmission.com> | 2004-10-16 06:20:29 +0000 |
| commit | 7003ba4a88a847707c55d593e517eaa70fc8c63d (patch) | |
| tree | ad29fcd2fde474cb9bdd32835a76101edabe1ef9 /src/boot | |
| parent | 216525d1fd86c13e0f1ebe85ba518cdc1da06fcb (diff) | |
- 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
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/hardwaremain.c | 11 |
1 files changed, 2 insertions, 9 deletions
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 <boot/tables.h> #include <device/device.h> #include <device/pci.h> -#include <device/chip.h> #include <delay.h> #include <stdlib.h> #include <part/hard_reset.h> @@ -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 |