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

[coreboot.git] / src / mainboard / technexion / tim8690 / mainboard.c

diff --git a/src/mainboard/technexion/tim8690/mainboard.c b/src/mainboard/technexion/tim8690/mainboard.c
index c607167bcbdcae83c77663ae9d982bfc31523f1a..664372d8792df15dc7420d825833415fc851d783 100644 (file)
--- a/src/mainboard/technexion/tim8690/mainboard.c
+++ b/src/mainboard/technexion/tim8690/mainboard.c
@@ -21,11 +21,11 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <arch/io.h>
-#include <boot/coreboot_tables.h>
+#include <boot/tables.h>
 #include <cpu/x86/msr.h>
 #include <cpu/amd/mtrr.h>
 #include <device/pci_def.h>
-#include <../southbridge/amd/sb600/sb600.h>
+#include <southbridge/amd/sb600/sb600.h>
 #include "chip.h"
 
 #define ADT7461_ADDRESS 0x4C
@@ -35,8 +35,6 @@
 extern int do_smbus_read_byte(u32 smbus_io_base, u32 device, u32 address);
 extern int do_smbus_write_byte(u32 smbus_io_base, u32 device, u32 address,
                               u8 val);
-extern void lb_add_memory_range(struct lb_memory *mem, uint32_t type,
-                               uint64_t start, uint64_t size);
 #define ADT7461_read_byte(address) \
        do_smbus_read_byte(SMBUS_IO_BASE, ADT7461_ADDRESS, address)
 #define ARA_read_byte(address) \
@@ -50,17 +48,17 @@ uint64_t uma_memory_base, uma_memory_size;
 
 /***************************************************
 * This board, the TIM-8690 has two Marvel 88e5056 PCI-E
-* 10/100/1000 chips on board. 
+* 10/100/1000 chips on board.
 * Both of their pin PERSTn pins are connected to GPIO 5 of the
 * SB600 southbridge.
 ****************************************************/
-static void enable_onboard_nic()
+static void enable_onboard_nic(void)
 {
 
        u8 byte;
        device_t sm_dev;
 
-       printk_info("enable_onboard_nic.\n");
+       printk(BIOS_INFO, "enable_onboard_nic.\n");
 
        sm_dev = dev_find_slot(0, PCI_DEVFN(0x14, 0));
 
@@ -80,7 +78,7 @@ static void enable_onboard_nic()
 
 /* set thermal config
  */
-static void set_thermal_config()
+static void set_thermal_config(void)
 {
        u8 byte;
        u16 word;
@@ -97,7 +95,7 @@ static void set_thermal_config()
 
        byte = ADT7461_read_byte(0x02); /* read status register to clear it */
        ARA_read_byte(0x05); /* A hardware alert can only be cleared by the master sending an ARA as a read command */
-       printk_info("Init adt7461 end , status 0x02 %02x\n", byte);
+       printk(BIOS_INFO, "Init adt7461 end , status 0x02 %02x\n", byte);
 
        /* sb600 settings for thermal config */
        /* set SB600 GPIO 64 to GPIO with pull-up */
@@ -145,24 +143,21 @@ static void set_thermal_config()
 * enable the dedicated function in tim8690 board.
 * This function called early than rs690_enable.
 *************************************************/
-void tim8690_enable(device_t dev)
+static void tim8690_enable(device_t dev)
 {
-       struct mainboard_config *mainboard =
-           (struct mainboard_config *)dev->chip_info;
-
-       printk_info("Mainboard tim8690 Enable. dev=0x%p\n", dev);
+       printk(BIOS_INFO, "Mainboard tim8690 Enable. dev=0x%p\n", dev);
 
 #if (CONFIG_GFXUMA == 1)
        msr_t msr, msr2;
 
        /* TOP_MEM: the top of DRAM below 4G */
        msr = rdmsr(TOP_MEM);
-       printk_info("%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
+       printk(BIOS_INFO, "%s, TOP MEM: msr.lo = 0x%08x, msr.hi = 0x%08x\n",
                    __func__, msr.lo, msr.hi);
 
        /* TOP_MEM2: the top of DRAM above 4G */
        msr2 = rdmsr(TOP_MEM2);
-       printk_info("%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
+       printk(BIOS_INFO, "%s, TOP MEM2: msr2.lo = 0x%08x, msr2.hi = 0x%08x\n",
                    __func__, msr2.lo, msr2.hi);
 
        switch (msr.lo) {
@@ -184,7 +179,7 @@ void tim8690_enable(device_t dev)
        }
 
        uma_memory_base = msr.lo - uma_memory_size;     /* TOP_MEM1 */
-       printk_info("%s: uma size 0x%08llx, memory start 0x%08llx\n",
+       printk(BIOS_INFO, "%s: uma size 0x%08llx, memory start 0x%08llx\n",
                    __func__, uma_memory_size, uma_memory_base);
 
        /* TODO: TOP_MEM2 */
@@ -203,11 +198,12 @@ int add_mainboard_resources(struct lb_memory *mem)
         * in some circumstances we want the memory mentioned as reserved.
         */
 #if (CONFIG_GFXUMA == 1)
-       printk_info("uma_memory_base=0x%llx, uma_memory_size=0x%llx \n",
+       printk(BIOS_INFO, "uma_memory_base=0x%llx, uma_memory_size=0x%llx \n",
        uma_memory_base, uma_memory_size);
        lb_add_memory_range(mem, LB_MEM_RESERVED,
                uma_memory_base, uma_memory_size);
 #endif
+       return 0;
 }
 
 struct chip_operations mainboard_ops = {