From c02b4fc9db3c3c1e263027382697b566127f66bb Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 22 Mar 2010 11:42:32 +0000 Subject: printk_foo -> printk(BIOS_FOO, ...) Signed-off-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5266 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/intel/hyperthreading/intel_sibling.c | 6 +++--- src/cpu/intel/model_1067x/model_1067x_init.c | 2 +- src/cpu/intel/model_106cx/cache_as_ram_disable.c | 4 ++-- src/cpu/intel/model_106cx/model_106cx_init.c | 2 +- src/cpu/intel/model_6ex/cache_as_ram_disable.c | 8 ++++---- src/cpu/intel/model_6ex/model_6ex_init.c | 2 +- src/cpu/intel/model_6fx/cache_as_ram_disable.c | 8 ++++---- src/cpu/intel/model_6fx/model_6fx_init.c | 2 +- src/cpu/intel/speedstep/acpi.c | 8 ++++---- 9 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/cpu/intel') diff --git a/src/cpu/intel/hyperthreading/intel_sibling.c b/src/cpu/intel/hyperthreading/intel_sibling.c index 52700fb4d2..5e77a765a8 100644 --- a/src/cpu/intel/hyperthreading/intel_sibling.c +++ b/src/cpu/intel/hyperthreading/intel_sibling.c @@ -31,7 +31,7 @@ void intel_sibling_init(device_t cpu) } #if 1 - printk_debug("CPU: %u %d siblings\n", + printk(BIOS_DEBUG, "CPU: %u %d siblings\n", cpu->path.apic.apic_id, siblings); #endif @@ -61,14 +61,14 @@ void intel_sibling_init(device_t cpu) } #if 1 - printk_debug("CPU: %u has sibling %u\n", + printk(BIOS_DEBUG, "CPU: %u has sibling %u\n", cpu->path.apic.apic_id, new->path.apic.apic_id); #endif /* Start the new cpu */ if (!start_cpu(new)) { /* Record the error in cpu? */ - printk_err("CPU %u would not start!\n", + printk(BIOS_ERR, "CPU %u would not start!\n", new->path.apic.apic_id); } } diff --git a/src/cpu/intel/model_1067x/model_1067x_init.c b/src/cpu/intel/model_1067x/model_1067x_init.c index b64d0f2465..fc20c6047f 100644 --- a/src/cpu/intel/model_1067x/model_1067x_init.c +++ b/src/cpu/intel/model_1067x/model_1067x_init.c @@ -210,7 +210,7 @@ static void model_1067x_init(device_t cpu) /* Print processor name */ fill_processor_name(processor_name); - printk_info("CPU: %s.\n", processor_name); + printk(BIOS_INFO, "CPU: %s.\n", processor_name); #if CONFIG_USBDEBUG_DIRECT // Is this caution really needed? diff --git a/src/cpu/intel/model_106cx/cache_as_ram_disable.c b/src/cpu/intel/model_106cx/cache_as_ram_disable.c index 4d108765c5..b9f7f669f9 100644 --- a/src/cpu/intel/model_106cx/cache_as_ram_disable.c +++ b/src/cpu/intel/model_106cx/cache_as_ram_disable.c @@ -36,12 +36,12 @@ void stage1_main(unsigned long bist) "movl %%esp, %0\n\t" : "=a" (v_esp) ); - printk_spew("v_esp=%08x\r\n", v_esp); + printk(BIOS_SPEW, "v_esp=%08x\r\n", v_esp); } cpu_reset_x: - printk_spew("cpu_reset = %08x\r\n",cpu_reset); + printk(BIOS_SPEW, "cpu_reset = %08x\r\n",cpu_reset); if(cpu_reset == 0) { print_spew("Clearing initial memory region: "); diff --git a/src/cpu/intel/model_106cx/model_106cx_init.c b/src/cpu/intel/model_106cx/model_106cx_init.c index 0be838b009..143a6f473a 100644 --- a/src/cpu/intel/model_106cx/model_106cx_init.c +++ b/src/cpu/intel/model_106cx/model_106cx_init.c @@ -171,7 +171,7 @@ static void model_106cx_init(device_t cpu) /* Print processor name */ fill_processor_name(processor_name); - printk_info("CPU: %s.\n", processor_name); + printk(BIOS_INFO, "CPU: %s.\n", processor_name); #if CONFIG_USBDEBUG_DIRECT // Is this caution really needed? 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 cbf7cdd37b..44ff264818 100644 --- a/src/cpu/intel/model_6ex/cache_as_ram_disable.c +++ b/src/cpu/intel/model_6ex/cache_as_ram_disable.c @@ -37,13 +37,13 @@ void stage1_main(unsigned long bist) "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 ( @@ -83,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"); } diff --git a/src/cpu/intel/model_6ex/model_6ex_init.c b/src/cpu/intel/model_6ex/model_6ex_init.c index d056bda733..f879f34869 100644 --- a/src/cpu/intel/model_6ex/model_6ex_init.c +++ b/src/cpu/intel/model_6ex/model_6ex_init.c @@ -200,7 +200,7 @@ static void model_6ex_init(device_t cpu) /* Print processor name */ fill_processor_name(processor_name); - printk_info("CPU: %s.\n", processor_name); + printk(BIOS_INFO, "CPU: %s.\n", processor_name); #if CONFIG_USBDEBUG_DIRECT // Is this caution really needed? diff --git a/src/cpu/intel/model_6fx/cache_as_ram_disable.c b/src/cpu/intel/model_6fx/cache_as_ram_disable.c index 32d921e7d6..fc9a13b307 100644 --- a/src/cpu/intel/model_6fx/cache_as_ram_disable.c +++ b/src/cpu/intel/model_6fx/cache_as_ram_disable.c @@ -38,13 +38,13 @@ void stage1_main(unsigned long bist) "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 ( @@ -84,5 +84,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"); } diff --git a/src/cpu/intel/model_6fx/model_6fx_init.c b/src/cpu/intel/model_6fx/model_6fx_init.c index 620affc066..f00aba8e33 100644 --- a/src/cpu/intel/model_6fx/model_6fx_init.c +++ b/src/cpu/intel/model_6fx/model_6fx_init.c @@ -227,7 +227,7 @@ static void model_6fx_init(device_t cpu) /* Print processor name */ fill_processor_name(processor_name); - printk_info("CPU: %s.\n", processor_name); + printk(BIOS_INFO, "CPU: %s.\n", processor_name); #if CONFIG_USBDEBUG_DIRECT // Is this caution really needed? diff --git a/src/cpu/intel/speedstep/acpi.c b/src/cpu/intel/speedstep/acpi.c index 9a0291d47c..920984369e 100644 --- a/src/cpu/intel/speedstep/acpi.c +++ b/src/cpu/intel/speedstep/acpi.c @@ -56,7 +56,7 @@ static int get_fsb(void) case 3: return 166; case 5: return 100; } - printk_debug("Warning: No supported FSB frequency. Assuming 200MHz\n"); + printk(BIOS_DEBUG, "Warning: No supported FSB frequency. Assuming 200MHz\n"); return 200; } @@ -68,7 +68,7 @@ void generate_cpu_entries(void) int totalcores = determine_total_number_of_cores(); int cores_per_package = (cpuid_ebx(1)>>16) & 0xff; int numcpus = totalcores/cores_per_package; // this assumes that all CPUs share the same layout - printk_debug("Found %d CPU(s) with %d core(s) each.\n", numcpus, cores_per_package); + printk(BIOS_DEBUG, "Found %d CPU(s) with %d core(s) each.\n", numcpus, cores_per_package); for (cpuID=1; cpuID <=numcpus; cpuID++) { for (coreID=1; coreID<=cores_per_package; coreID++) { @@ -93,7 +93,7 @@ void generate_cpu_entries(void) int vid_max=msr.lo & 0x3f; int clock_max=get_fsb()*busratio_max; int clock_min=get_fsb()*busratio_min; - printk_debug("clocks between %d and %d MHz.\n", clock_min, clock_max); + printk(BIOS_DEBUG, "clocks between %d and %d MHz.\n", clock_min, clock_max); #define MEROM_MIN_POWER 16000 #define MEROM_MAX_POWER 35000 int power_max=MEROM_MAX_POWER; @@ -104,7 +104,7 @@ void generate_cpu_entries(void) busratio_step <<= 1; num_states >>= 1; } - printk_debug("adding %x P-States between busratio %x and %x, incl. P0\n", num_states+1, busratio_min, busratio_max); + printk(BIOS_DEBUG, "adding %x P-States between busratio %x and %x, incl. P0\n", num_states+1, busratio_min, busratio_max); int vid_step=(vid_max-vid_min)/num_states; int power_step=(power_max-power_min)/num_states; int clock_step=(clock_max-clock_min)/num_states; -- cgit v1.2.3