remove trailing whitespace

[coreboot.git] / src / mainboard / amd / tilapia_fam10 / romstage.c

diff --git a/src/mainboard/amd/tilapia_fam10/romstage.c b/src/mainboard/amd/tilapia_fam10/romstage.c
index ea8ec41fdd48fd0710b055d6b0a143e7bcf40115..52cab42eb4abc18d2e0306137e084f5c80970dc5 100644 (file)
--- a/src/mainboard/amd/tilapia_fam10/romstage.c
+++ b/src/mainboard/amd/tilapia_fam10/romstage.c
@@ -43,19 +43,19 @@
 #include <console/loglevel.h>
 #include "cpu/x86/bist.h"
 #include "superio/ite/it8718f/early_serial.c"
-#include <usbdebug.h>
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include <cpu/amd/mtrr.h>
 #include "northbridge/amd/amdfam10/setup_resource_map.c"
 #include "southbridge/amd/rs780/early_setup.c"
-#include "southbridge/amd/sb700/early_setup.c"
+#include "southbridge/amd/sb700/sb700.h"
+#include "southbridge/amd/sb700/smbus.h"
 #include "northbridge/amd/amdfam10/debug.c"
 
 static void activate_spd_rom(const struct mem_controller *ctrl) { }
 
 static int spd_read_byte(u32 device, u32 address)
 {
-       return smbus_read_byte(device, address);
+       return do_smbus_read_byte(SMBUS_IO_BASE, device, address);
 }
 
 #include "northbridge/amd/amdfam10/amdfam10.h"
@@ -87,7 +87,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
                /* mov bsp to bus 0xff when > 8 nodes */
                set_bsp_node_CHtExtNodeCfgEn();
                enumerate_ht_chain();
-               sb700_pci_port80();
+               sb7xx_51xx_pci_port80();
        }
 
        post_code(0x30);
@@ -100,18 +100,11 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
        post_code(0x32);
 
        enable_rs780_dev8();
-       sb700_lpc_init();
+       sb7xx_51xx_lpc_init();
 
        it8718f_enable_serial(0, CONFIG_TTYS0_BASE);
-       uart_init();
-
-#if CONFIG_USBDEBUG
-       sb700_enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);
-       early_usbdebug_init();
-#endif
 
        console_init();
-       printk(BIOS_DEBUG, "\n");
 
 //     dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE);
 
@@ -166,7 +159,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 
        /* run _early_setup before soft-reset. */
        rs780_early_setup();
-       sb700_early_setup();
+       sb7xx_51xx_early_setup();
 
 #if CONFIG_SET_FIDVID
        msr = rdmsr(0xc0010071);
@@ -224,7 +217,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
 //     die("After MCT init before CAR disabled.");
 
        rs780_before_pci_init();
-       sb700_before_pci_init();
+       sb7xx_51xx_before_pci_init();
 
        post_code(0x42);
        printk(BIOS_DEBUG, "\n*** Yes, the copy/decompress is taking a while, FIXME!\n");