printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / cpu / intel / model_6ex / cache_as_ram_disable.c

diff --git a/src/cpu/intel/model_6ex/cache_as_ram_disable.c b/src/cpu/intel/model_6ex/cache_as_ram_disable.c
index a22978e051776f3e66338bf11ef9b71da4315d0d..44ff26481840b917c184c5a3dc2cd640a8774b98 100644 (file)
--- a/src/cpu/intel/model_6ex/cache_as_ram_disable.c
+++ b/src/cpu/intel/model_6ex/cache_as_ram_disable.c
@@ -27,46 +27,23 @@ void stage1_main(unsigned long bist)
 {
        unsigned int cpu_reset = 0;
 
-#if CONFIG_USE_FALLBACK_IMAGE == 1
-        /* Is this a deliberate reset by the bios */
-        if (bios_reset_detected() && last_boot_normal()) {
-                goto normal_image;
-        } else {
-               /* This is the primary cpu how should I boot? */
-               check_cmos_failed();
-               if (do_normal_boot()) {
-                       goto normal_image;
-               }
-               else {
-                       goto fallback_image;
-               }
-       }
- normal_image:
-        __asm__ volatile ("jmp __normal_image"
-                : /* outputs */
-                : "a" (bist) /* inputs */
-                );
- fallback_image:
-#endif
-
        real_main(bist);
 
        /* No servicable parts below this line .. */
-
-#if CAR_DEBUG
+#ifdef CAR_DEBUG
         /* Check value of esp to verify if we have enough rom for stack in Cache as RAM */
        unsigned v_esp;
        __asm__ volatile (
                "movl   %%esp, %0\n"
                : "=a" (v_esp)
        );
-       printk_spew("v_esp=%08x\n", v_esp);
+       printk(BIOS_SPEW, "v_esp=%08x\n", v_esp);
 #endif
 
 cpu_reset_x:
 
-        printk_spew("cpu_reset = %08x\n", cpu_reset);
-       printk_spew("No cache as ram now - ");
+        printk(BIOS_SPEW, "cpu_reset = %08x\n", cpu_reset);
+       printk(BIOS_SPEW, "No cache as ram now - ");
 
        /* store cpu_reset to ebx */
         __asm__ volatile (
@@ -106,5 +83,5 @@ cpu_reset_x:
        }
 
        /* We will not return */
-       printk_debug("sorry. parachute did not open.\n");
+       printk(BIOS_DEBUG, "sorry. parachute did not open.\n");
 }