Apply cache-as-ram conditionally on socket mPGA604

[coreboot.git] / src / lib / fallback_boot.c

diff --git a/src/lib/fallback_boot.c b/src/lib/fallback_boot.c
index 1bddd0a1692290164b35dc65b3aa7603fdbf0029..b5ec6c30301805adeb68f1643fa3cb49b7afce75 100644 (file)
--- a/src/lib/fallback_boot.c
+++ b/src/lib/fallback_boot.c
@@ -1,9 +1,11 @@
 #include <console/console.h>
-#include <part/fallback_boot.h>
+#include <fallback.h>
+#include <watchdog.h>
 #include <pc80/mc146818rtc.h>
 #include <arch/io.h>
 
-void boot_successful(void)
+
+void set_boot_successful(void)
 {
        /* Remember I succesfully booted by setting
         * the initial boot direction
@@ -16,10 +18,24 @@ void boot_successful(void)
 
        byte = inb(RTC_PORT(1));
        byte &= 0xfe;
-       byte |= (byte & 2) >> 1;
+       byte |= (byte & (1 << 1)) >> 1;
 
        /* If we are in normal mode set the boot count to 0 */
        if(byte & 1)
                byte &= 0x0f;
        outb(byte, RTC_PORT(1));
 }
+
+void boot_successful(void)
+{
+#if CONFIG_FRAMEBUFFER_SET_VESA_MODE && !CONFIG_FRAMEBUFFER_KEEP_VESA_MODE
+       void vbe_textmode_console(void);
+
+       vbe_textmode_console();
+#endif
+       /* Remember this was a successful boot */
+       set_boot_successful();
+
+       /* turn off the boot watchdog */
+       watchdog_off();
+}