Alexandru Gagniuc (mr.nuke.me@gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/12879
-gerrit
commit c06d399c5df4150be58dfa61b28df8c32a4e596c Author: Alexandru Gagniuc mr.nuke.me@gmail.com Date: Fri Jan 8 22:57:58 2016 -0800
cpu/qemu-x86: Remove "bist" parameter handling from romstage
This parameter is unused at this point, so there is no reason hauling it around in assembly in order to pass it to C code.
Change-Id: Ice3ff6f06f561099a3ed7764062f0ac0521855be Signed-off-by: Alexandru Gagniuc mr.nuke.me@gmail.com --- src/cpu/qemu-x86/romstage.h | 18 ++++++++++++++++++ src/cpu/qemu-x86/romstage_entry.inc | 8 -------- src/mainboard/emulation/qemu-i440fx/romstage.c | 4 ++-- src/mainboard/emulation/qemu-q35/romstage.c | 4 ++-- 4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/src/cpu/qemu-x86/romstage.h b/src/cpu/qemu-x86/romstage.h new file mode 100644 index 0000000..ea628c8 --- /dev/null +++ b/src/cpu/qemu-x86/romstage.h @@ -0,0 +1,18 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2016 Alexandru Gagniuc mr.nuke.me@gmail.com + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + */ + +#ifndef _CPU_QEMU_X86_ROMSTAGE_H_ +#define _CPU_QEMU_X86_ROMSTAGE_H_ + +/* romstage C entry point */ +void main(void); + +#endif /* _CPU_QEMU_X86_ROMSTAGE_H_ */ diff --git a/src/cpu/qemu-x86/romstage_entry.inc b/src/cpu/qemu-x86/romstage_entry.inc index c930fdc..75eb700 100644 --- a/src/cpu/qemu-x86/romstage_entry.inc +++ b/src/cpu/qemu-x86/romstage_entry.inc @@ -24,9 +24,6 @@
#define CPU_PHYSMASK_HI (1 << (CONFIG_CPU_ADDR_BITS - 32) - 1)
- /* Save the BIST result. */ - movl %eax, %ebp - cache_as_ram: post_code(0x20)
@@ -34,11 +31,6 @@ cache_as_ram: movl $(CACHE_AS_RAM_SIZE + CACHE_AS_RAM_BASE - 4), %eax movl %eax, %esp
- /* Restore the BIST result. */ - movl %ebp, %eax - movl %esp, %ebp - pushl %eax - before_romstage: post_code(0x29) /* Call romstage.c main function. */ diff --git a/src/mainboard/emulation/qemu-i440fx/romstage.c b/src/mainboard/emulation/qemu-i440fx/romstage.c index 2d2a87e..1aa773d 100644 --- a/src/mainboard/emulation/qemu-i440fx/romstage.c +++ b/src/mainboard/emulation/qemu-i440fx/romstage.c @@ -27,8 +27,8 @@
#include "memory.c"
-#include <cpu/intel/romstage.h> -void main(unsigned long bist) +#include <cpu/qemu-x86/romstage.h> +void main(void) { int cbmem_was_initted;
diff --git a/src/mainboard/emulation/qemu-q35/romstage.c b/src/mainboard/emulation/qemu-q35/romstage.c index f6b7b63..bba605e 100644 --- a/src/mainboard/emulation/qemu-q35/romstage.c +++ b/src/mainboard/emulation/qemu-q35/romstage.c @@ -28,8 +28,8 @@
#include "../qemu-i440fx/memory.c"
-#include <cpu/intel/romstage.h> -void main(unsigned long bist) +#include <cpu/qemu-x86/romstage.h> +void main(void) { int cbmem_was_initted;