CBMEM CONSOLE: Add code using the new console driver.

[coreboot.git] / src / boot / hardwaremain.c

diff --git a/src/boot/hardwaremain.c b/src/boot/hardwaremain.c
index f56069effd17d5bc56383c0c5f89bacbb63423ab..9b293c049a61833899abc886fb0cb7395ead7afe 100644 (file)
--- a/src/boot/hardwaremain.c
+++ b/src/boot/hardwaremain.c
@@ -31,8 +31,7 @@ it with the version available from LANL.
 #include <device/pci.h>
 #include <delay.h>
 #include <stdlib.h>
-#include <part/hard_reset.h>
-#include <part/init_timer.h>
+#include <reset.h>
 #include <boot/tables.h>
 #include <boot/elf.h>
 #include <cbfs.h>
@@ -46,10 +45,10 @@ it with the version available from LANL.
 /**
  * @brief Main function of the RAM part of coreboot.
  *
- * Coreboot is divided into Pre-RAM part and RAM part. 
- * 
+ * Coreboot is divided into Pre-RAM part and RAM part.
+ *
  * Device Enumeration:
- *     In the dev_enumerate() phase, 
+ *     In the dev_enumerate() phase,
  */
 
 void hardwaremain(int boot_complete);
@@ -58,18 +57,18 @@ void hardwaremain(int boot_complete)
 {
        struct lb_memory *lb_mem;
 
-       post_code(0x80);
+       post_code(POST_ENTRY_RAMSTAGE);
 
        /* console_init() MUST PRECEDE ALL printk()! */
        console_init();
-       
-       post_code(0x39);
 
-       printk(BIOS_NOTICE, "coreboot-%s%s %s %s...\n", 
+       post_code(POST_CONSOLE_READY);
+
+       printk(BIOS_NOTICE, "coreboot-%s%s %s %s...\n",
                      coreboot_version, coreboot_extra_version, coreboot_build,
                      (boot_complete)?"rebooting":"booting");
 
-       post_code(0x40);
+       post_code(POST_CONSOLE_BOOT_MSG);
 
        /* If we have already booted attempt a hard reboot */
        if (boot_complete) {
@@ -77,22 +76,25 @@ void hardwaremain(int boot_complete)
        }
 
        /* FIXME: Is there a better way to handle this? */
-       init_timer(); 
+       init_timer();
 
        /* Find the devices we don't have hard coded knowledge about. */
        dev_enumerate();
-       post_code(0x66);
+       post_code(POST_DEVICE_ENUMERATION_COMPLETE);
        /* Now compute and assign the bus resources. */
        dev_configure();
-       post_code(0x88);
+       post_code(POST_DEVICE_CONFIGURATION_COMPLETE);
        /* Now actually enable devices on the bus */
        dev_enable();
        /* And of course initialize devices on the bus */
        dev_initialize();
-       post_code(0x89);
+       post_code(POST_DEVICES_ENABLED);
 
 #if CONFIG_WRITE_HIGH_TABLES == 1
        cbmem_initialize();
+#if CONFIG_CONSOLE_CBMEM
+       cbmemc_reinit();
+#endif
 #endif
 #if CONFIG_HAVE_ACPI_RESUME == 1
        suspend_resume();
@@ -103,11 +105,7 @@ void hardwaremain(int boot_complete)
         * write our configuration tables.
         */
        lb_mem = write_tables();
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-       cbfs_load_payload(lb_mem, "fallback/payload");
-#else
-       cbfs_load_payload(lb_mem, "normal/payload");
-#endif
+       cbfs_load_payload(lb_mem, CONFIG_CBFS_PREFIX "/payload");
        printk(BIOS_ERR, "Boot failed.\n");
 }