Since some people disapprove of white space cleanups mixed in regular commits

[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..28d6de18e166301bc44771d7e4bb3413149db20c 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) {
@@ -104,7 +104,7 @@ struct fan_speed {
        u16 fan_speed;
 };
 
-// FANIN Target Speed Register 
+// FANIN Target Speed Register
 // FANIN = 337500 / RPM
 struct fan_speed fan_speeds[] = {
        { 0x3c, 5625 }, { 0x41, 5192 }, { 0x47, 4753 }, { 0x4e, 4326 },
@@ -119,7 +119,7 @@ struct temperature {
 };
 
 struct temperature temperatures[] = {
-       { 30,  86 }, { 33,  91 }, { 36,  96 }, { 39, 102 }, 
+       { 30,  86 }, { 33,  91 }, { 36,  96 }, { 39, 102 },
        { 42, 107 }, { 45, 113 }, { 48, 118 }, { 51, 123 },
        { 54, 129 }, { 57, 134 }, { 60, 140 }, { 63, 145 },
        { 66, 150 }, { 69, 156 }, { 72, 161 }, { 75, 167 }
@@ -144,7 +144,7 @@ static void hwm_setup(void)
                sysfan_speed = FAN_SPEED_5625;
        //if (get_option(&sysfan_temperature, "sysfan_temperature") < 0)
        //      sysfan_temperature = FAN_TEMPERATURE_30DEGC;
-       
+
        // hwm_write(0x31, 0x20); // AVCC high limit
        // hwm_write(0x34, 0x06); // VIN2 low limit
 
@@ -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
@@ -223,10 +223,10 @@ static void verb_setup(void)
        cim_verb_data_size = 0;
 }
 
-// mainboard_enable is executed as first thing after 
+// mainboard_enable is executed as first thing after
 // enumerate_buses().
 
-static void mainboard_enable(device_t dev) 
+static void mainboard_enable(device_t dev)
 {
 #if CONFIG_PCI_OPTION_ROM_RUN_YABEL
        /* Install custom int15 handler for VGA OPROM */