From 645bd273e1aee25d06378d4dc63c10364cbc9ce2 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Wed, 26 Nov 2008 02:16:37 +0000 Subject: [PATCH] Experimental backout of the critical code parts in r1057 as requested by Stefan. The only changes left from r1057 are: - Added comments - Two initial pushes of 0x00000000 (32 bits each) to the stack as safety Signed-off-by: Carl-Daniel Hailfinger Acked-by: Carl-Daniel Hailfinger git-svn-id: svn://coreboot.org/repository/coreboot-v3@1058 f3766cd6-281f-0410-b1cd-43a5c92072e9 --- arch/x86/intel/core2/stage0.S | 3 +++ arch/x86/stage1.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/intel/core2/stage0.S b/arch/x86/intel/core2/stage0.S index 97bdeffd16..ff2947943e 100644 --- a/arch/x86/intel/core2/stage0.S +++ b/arch/x86/intel/core2/stage0.S @@ -176,7 +176,10 @@ clear_mtrrs: /* First parameter: bist */ pushl %eax +#if 0 + /* this will be interpreted as failed bist */ port80_post(0x23) +#endif call stage1_phase1 /* We will not go back. */ diff --git a/arch/x86/stage1.c b/arch/x86/stage1.c index 9fc9516e05..7bd0e52a98 100644 --- a/arch/x86/stage1.c +++ b/arch/x86/stage1.c @@ -187,7 +187,7 @@ static int run_address_multiboot(void *f, struct multiboot_info *mbi) * that we are restarting after some sort of reconfiguration. Note that we could use it on geode but * do not at present. */ -void __attribute__((stdcall,regparm(0))) stage1_phase1(u32 bist, u32 init_detected) +void __attribute__((stdcall)) stage1_phase1(u32 bist, u32 init_detected) { struct global_vars globvars; int ret;