projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 4b8e2fe06d1682bf011f06f2491decb5b29fed73..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>
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>
@@
-18,38
+7,17
@@
#include <device/pnp_def.h>
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#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"
-
-#if CONFIG_USE_INIT == 0
- #include "lib/memcpy.c"
-#endif
-
-#include "arch/i386/lib/console.c"
+#include <pc80/mc146818rtc.h>
+#include "console/console.c"
#include "lib/uart8250.c"
#include "console/vtxprintf.c"
#include "lib/uart8250.c"
#include "console/vtxprintf.c"
-#if 0
-static void post_code(uint8_t value) {
-#if 1
- int i;
- for(i=0;i<0x80000;i++) {
- outb(value, 0x80);
- }
-#endif
-}
-#endif
-
#include <cpu/amd/model_fxx_rev.h>
#include "northbridge/amd/amdk8/raminit.h"
#include "cpu/amd/model_fxx/apic_timer.c"
#include "lib/delay.c"
#include <cpu/amd/model_fxx_rev.h>
#include "northbridge/amd/amdk8/raminit.h"
#include "cpu/amd/model_fxx/apic_timer.c"
#include "lib/delay.c"
-
-//#include "cpu/x86/lapic/boot_cpu.c"
#include "northbridge/amd/amdk8/reset_test.c"
#include "northbridge/amd/amdk8/debug.c"
#include "northbridge/amd/amdk8/reset_test.c"
#include "northbridge/amd/amdk8/debug.c"
@@
-74,33
+42,30
@@
static inline unsigned get_nodes(void)
void hardwaremain(int ret_addr)
{
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();
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("\r\n");
-#endif
+ printk(BIOS_DEBUG, "CODE IN CACHE ON NODE: %02x\n", id.nodeid);
train_ram(id.nodeid, sysinfo, sysinfox);
/*
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)
);
__asm__ volatile (
"movl %0, %%edi\n\t"
"jmp *%%edi\n\t"
:: "a"(ret_addr)
);
-
-
-
}
#include <arch/registers.h>
}
#include <arch/registers.h>
@@
-112,4
+77,3
@@
void x86_exception(struct eregs *info)
} while(1);
}
} while(1);
}
-