printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / cpu / amd / model_gx2 / vsmsetup.c

diff --git a/src/cpu/amd/model_gx2/vsmsetup.c b/src/cpu/amd/model_gx2/vsmsetup.c
index 251d580691a9e4e06bb878255ed57a4715ffc81c..aa25042a61732ee06d9fcf99cdbcaf76257dd764 100644 (file)
--- a/src/cpu/amd/model_gx2/vsmsetup.c
+++ b/src/cpu/amd/model_gx2/vsmsetup.c
@@ -33,6 +33,7 @@
 #include <cpu/x86/lapic.h>
 #include <cpu/x86/cache.h>
 #include <arch/io.h>
+#include <cbfs.h>
 
 u32 VSA_vrRead(u16 classIndex);
 void do_vsmbios(void);
@@ -186,23 +187,16 @@ void do_vsmbios(void)
        unsigned char *buf;
        int i;
 
-       printk_err( "do_vsmbios\n");
+       printk(BIOS_ERR,  "do_vsmbios\n");
        /* Clear VSM BIOS data area. */
        for (i = 0x400; i < 0x500; i++)
                *(volatile unsigned char *)i = 0;
-       /* set up cbfs and find the vsa file -- later */
-/*
-       init_archive(&archive);
-
-       if (find_file(&archive, "blob/vsa", &file))
-               die("FATAL: NO VSA found!\n");
-
-       if (process_file(&file, (void *)VSA2_BUFFER))
-               die("FATAL: Processing /blob/vsa failed\n");
- */
+       if ((unsigned int)cbfs_load_stage("vsa") != VSA2_ENTRY_POINT) {
+               printk(BIOS_ERR, "do_vsmbios: Failed to load VSA.\n");
+       }
+       buf = VSA2_BUFFER;
 
-       buf = (unsigned char *)VSA2_BUFFER;
-       printk_debug("buf[0x20] signature is %x:%x:%x:%x\n",
+       printk(BIOS_DEBUG, "buf[0x20] signature is %x:%x:%x:%x\n",
               buf[0x20], buf[0x21], buf[0x22], buf[0x23]);
        /* Check for POST code at start of vsainit.bin. If you don't see it,
         * don't bother.
@@ -213,7 +207,7 @@ void do_vsmbios(void)
        }
 
        /* ecx gets smm, edx gets sysm. */
-       printk_err("Call real_mode_switch_call_vsm\n");
+       printk(BIOS_ERR, "Call real_mode_switch_call_vsm\n");
 //     real_mode_switch_call_vsm(MSR_GLIU0_SMM, MSR_GLIU0_SYSMEM);
 
        /* Restart Timer 1. */
@@ -222,7 +216,7 @@ void do_vsmbios(void)
 
        /* Check that VSA is running OK. */
        if (VSA_vrRead(SIGNATURE) == VSA2_SIGNATURE)
-               printk_debug("do_vsmbios: VSA2 VR signature verified\n");
+               printk(BIOS_DEBUG, "do_vsmbios: VSA2 VR signature verified\n");
        else
                die("FATAL: VSA2 VR signature not valid, install failed!\n");
 }