projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
In 2007 Adrian Reber suggested that we drop ASSEMBLY in favor of __ASSEMBLER__.
[coreboot.git]
/
src
/
mainboard
/
nvidia
/
l1_2pvv
/
ap_romstage.c
diff --git
a/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
b/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
index 6efcb980a3ff3a33f268c26559cb1520cfd41b52..c1c49cca90496b911ef5b8b2ec9483174d065dfd 100644
(file)
--- a/
src/mainboard/nvidia/l1_2pvv/ap_romstage.c
+++ b/
src/mainboard/nvidia/l1_2pvv/ap_romstage.c
@@
-19,9
+19,6
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#define ASSEMBLY 1
-#define __PRE_RAM__
-
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>
#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0
#include <stdint.h>
@@
-32,8
+29,6
@@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
-
#include "lib/uart8250.c"
#include "arch/x86/lib/printk_init.c"
#include "console/vtxprintf.c"
#include "lib/uart8250.c"
#include "arch/x86/lib/printk_init.c"
#include "console/vtxprintf.c"
@@
-45,7
+40,6
@@
#include "lib/delay.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"
@@
-78,17
+72,15
@@
void hardwaremain(int ret_addr)
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>
@@
-99,5
+91,3
@@
void x86_exception(struct eregs *info)
hlt();
} while(1);
}
hlt();
} while(1);
}
-
-