printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / mainboard / kontron / 986lcd-m / mainboard.c

diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index 2d114df2ef72074b0e3cc8ce4e4f6e335b91c632..c7f2ee00e443a1babfc66ba10daa88bd759cb344 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -3,10 +3,9 @@
  *
  * Copyright (C) 2007-2009 coresystems GmbH
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,15 +14,16 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <types.h>
 #include <device/device.h>
 #include <console/console.h>
 #include <boot/tables.h>
+#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
 #include <x86emu/x86emu.h>
+#endif
 #include <pc80/mc146818rtc.h>
 #include <arch/io.h>
 #include <arch/coreboot_tables.h>
@@ -47,7 +47,7 @@ static int int15_handler(void)
 #define BOOT_DISPLAY_EFP2      (1 << 6)
 #define BOOT_DISPLAY_LCD2      (1 << 7)
 
-       printk_debug("%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
+       printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
                          __func__, M.x86.R_AX, M.x86.R_BX, M.x86.R_CX, M.x86.R_DX);
 
        switch (M.x86.R_AX) {
@@ -176,12 +176,12 @@ static void hwm_setup(void)
 
        switch (cpufan_control) {
        case FAN_CRUISE_CONTROL_SPEED:
-               printk_debug("Fan Cruise Control setting CPU fan to %d RPM\n",
+               printk(BIOS_DEBUG, "Fan Cruise Control setting CPU fan to %d RPM\n",
                                fan_speeds[cpufan_speed].fan_speed);
                hwm_write(0x06, fan_speeds[cpufan_speed].fan_in);  // CPUFANIN target speed
                break;
        case FAN_CRUISE_CONTROL_THERMAL:
-               printk_debug("Fan Cruise Control setting CPU fan to activation at %d deg C/%d deg F\n",
+               printk(BIOS_DEBUG, "Fan Cruise Control setting CPU fan to activation at %d deg C/%d deg F\n",
                                temperatures[cpufan_temperature].deg_celsius,
                                temperatures[cpufan_temperature].deg_fahrenheit);
                hwm_write(0x06, temperatures[cpufan_temperature].deg_celsius);  // CPUFANIN target temperature
@@ -190,12 +190,12 @@ static void hwm_setup(void)
 
        switch (sysfan_control) {
        case FAN_CRUISE_CONTROL_SPEED:
-               printk_debug("Fan Cruise Control setting system fan to %d RPM\n",
+               printk(BIOS_DEBUG, "Fan Cruise Control setting system fan to %d RPM\n",
                                fan_speeds[sysfan_speed].fan_speed);
                hwm_write(0x05, fan_speeds[sysfan_speed].fan_in);  // SYSFANIN target speed
                break;
        case FAN_CRUISE_CONTROL_THERMAL:
-               printk_debug("Fan Cruise Control setting system fan to activation at %d deg C/%d deg F\n",
+               printk(BIOS_DEBUG, "Fan Cruise Control setting system fan to activation at %d deg C/%d deg F\n",
                                temperatures[sysfan_temperature].deg_celsius,
                                temperatures[sysfan_temperature].deg_fahrenheit);
                hwm_write(0x05, temperatures[sysfan_temperature].deg_celsius); // SYSFANIN target temperature