printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / mainboard / kontron / kt690 / romstage.c

diff --git a/src/mainboard/kontron/kt690/romstage.c b/src/mainboard/kontron/kt690/romstage.c
index a2d20b9488f4147cc7de71ac170df8911114e7df..8ea8e6eae1a5e5af60ea941e97e2840de741d882 100644 (file)
--- a/src/mainboard/kontron/kt690/romstage.c
+++ b/src/mainboard/kontron/kt690/romstage.c
@@ -113,7 +113,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        struct cpuid_result cpuid1;
        struct sys_info *sysinfo = (struct sys_info *)(CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE);
 
-       if (!((cpu_init_detectedx) || (!boot_cpu()))) {
+       if (!cpu_init_detectedx && boot_cpu()) {
                /* Nothing special needs to be done to find bus 0 */
                /* Allow the HT devices to be found */
                enumerate_ht_chain();
@@ -136,7 +136,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        /* Halt if there was a built in self test failure */
        report_bist_failure(bist);
-       printk_debug("bsp_apicid=0x%x\n", bsp_apicid);
+       printk(BIOS_DEBUG, "bsp_apicid=0x%x\n", bsp_apicid);
 
        setup_kt690_resource_map();
 
@@ -162,7 +162,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
                /* Read FIDVID_STATUS */
                msr=rdmsr(0xc0010042);
-               printk_debug("begin msr fid, vid: hi=0x%x, lo=0x%x\n", msr.hi, msr.lo);
+               printk(BIOS_DEBUG, "begin msr fid, vid: hi=0x%x, lo=0x%x\n", msr.hi, msr.lo);
 
                enable_fid_change();
                enable_fid_change_on_sb(sysinfo->sbbusn, sysinfo->sbdn);
@@ -170,17 +170,17 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
                /* show final fid and vid */
                msr=rdmsr(0xc0010042);
-               printk_debug("end msr fid, vid: hi=0x%x, lo=0x%x\n", msr.hi, msr.lo);
+               printk(BIOS_DEBUG, "end msr fid, vid: hi=0x%x, lo=0x%x\n", msr.hi, msr.lo);
 
        } else {
-               printk_debug("Changing FIDVID not supported\n");
-               printk_spew("... because cpuid returned %08x\n", cpuid1.edx);
+               printk(BIOS_DEBUG, "Changing FIDVID not supported\n");
+               printk(BIOS_SPEW, "... because cpuid returned %08x\n", cpuid1.edx);
        }
 
        needs_reset = optimize_link_coherent_ht();
        needs_reset |= optimize_link_incoherent_ht(sysinfo);
        rs690_htinit();
-       printk_debug("needs_reset=0x%x\n", needs_reset);
+       printk(BIOS_DEBUG, "needs_reset=0x%x\n", needs_reset);
 
 
        if (needs_reset) {
@@ -191,7 +191,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        allow_all_aps_stop(bsp_apicid);
 
        /* It's the time to set ctrl now; */
-       printk_debug("sysinfo->nodes: %2x  sysinfo->ctrl: %2x  spd_addr: %2x\n",
+       printk(BIOS_DEBUG, "sysinfo->nodes: %2x  sysinfo->ctrl: %2x  spd_addr: %2x\n",
                     sysinfo->nodes, sysinfo->ctrl, spd_addr);
        fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr);
        sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo);