remove trailing whitespace

[coreboot.git] / src / mainboard / amd / serengeti_cheetah / ap_romstage.c

diff --git a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
index f132ec727cc5f158803c8a78710a078230314661..65ac2e641cbe9fad293a749db745793b402f9807 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
@@ -1,14 +1,3 @@
-#define ASSEMBLY 1
-#define __PRE_RAM__
-
-#define RAMINIT_SYSINFO 1
-#define CACHE_AS_RAM_ADDRESS_DEBUG 0
-
-#define SET_NB_CFG_54 1
-
-//used by raminit
-#define QRANK_DIMM_SUPPORT 1
-
 #define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
 
 #include <stdint.h>
@@ -18,11 +7,7 @@
 #include <device/pnp_def.h>
 #include <arch/romcc_io.h>
 #include <cpu/x86/lapic.h>
-#include "option_table.h"
-#include "pc80/mc146818rtc_early.c"
-#include "pc80/serial.c"
-#include "./arch/i386/lib/printk_init.c"
-
+#include <pc80/mc146818rtc.h>
 #include "console/console.c"
 #include "lib/uart8250.c"
 #include "console/vtxprintf.c"
@@ -33,8 +18,6 @@
 
 #include "lib/delay.c"
 
-
-//#include "cpu/x86/lapic/boot_cpu.c"
 #include "northbridge/amd/amdk8/reset_test.c"
 
 #include "northbridge/amd/amdk8/debug.c"
@@ -59,33 +42,30 @@ static inline unsigned get_nodes(void)
 
 void hardwaremain(int ret_addr)
 {
-       struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in CACHE
-        struct sys_info *sysinfox = ((CONFIG_RAMTOP) - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in RAM
+       struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE +
+                       CONFIG_DCACHE_RAM_SIZE -
+                       CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in CACHE
+       struct sys_info *sysinfox = ((CONFIG_RAMTOP) -
+                       CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); // in RAM
 
        struct node_core_id id;
 
        id = get_node_core_id_x();
 
-#if CONFIG_USE_PRINTK_IN_CAR
-        printk(BIOS_DEBUG, "CODE IN CACHE ON NODE: %02x\n");
-#else
-        print_debug("CODE IN CACHE ON NODE:"); print_debug_hex8(id.nodeid); print_debug("\n");
-#endif
+        printk(BIOS_DEBUG, "CODE IN CACHE ON NODE: %02x\n", id.nodeid);
 
        train_ram(id.nodeid, sysinfo, sysinfox);
 
        /*
-               go back, but can not use stack any more, because we only keep ret_addr and can not restore esp, and ebp
-       */
+        * go back, but can not use stack any more, because we
+        * only keep ret_addr and can not restore esp, and ebp.
+        */
 
         __asm__ volatile (
                 "movl  %0, %%edi\n\t"
                 "jmp     *%%edi\n\t"
                 :: "a"(ret_addr)
         );
-
-
-
 }
 
 #include <arch/registers.h>
@@ -97,4 +77,3 @@ void x86_exception(struct eregs *info)
         } while(1);
 }
 
-