[coreboot] [commit] r5316 - in trunk/src: cpu cpu/emulation mainboard/emulation/qemu-x86
repository service
svn at coreboot.org
Mon Mar 29 23:17:26 CEST 2010
Author: stepan
Date: Mon Mar 29 23:17:25 2010
New Revision: 5316
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5316
Log:
qemu: drop "northbridge.c" from src/cpu/...
It's not a real northbridge, so I just move it into the mainboard directory for
now (until we maybe have a qemu-q35 image some day?)
Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>
Added:
trunk/src/mainboard/emulation/qemu-x86/northbridge.c
- copied, changed from r5315, trunk/src/cpu/emulation/qemu-x86/northbridge.c
Deleted:
trunk/src/cpu/emulation/
Modified:
trunk/src/cpu/Kconfig
trunk/src/cpu/Makefile.inc
trunk/src/mainboard/emulation/qemu-x86/Kconfig
trunk/src/mainboard/emulation/qemu-x86/Makefile.inc
trunk/src/mainboard/emulation/qemu-x86/chip.h
trunk/src/mainboard/emulation/qemu-x86/romstage.c
Modified: trunk/src/cpu/Kconfig
==============================================================================
--- trunk/src/cpu/Kconfig Mon Mar 29 21:19:16 2010 (r5315)
+++ trunk/src/cpu/Kconfig Mon Mar 29 23:17:25 2010 (r5316)
@@ -1,5 +1,4 @@
source src/cpu/amd/Kconfig
-source src/cpu/emulation/Kconfig
source src/cpu/intel/Kconfig
source src/cpu/via/Kconfig
source src/cpu/x86/Kconfig
Modified: trunk/src/cpu/Makefile.inc
==============================================================================
--- trunk/src/cpu/Makefile.inc Mon Mar 29 21:19:16 2010 (r5315)
+++ trunk/src/cpu/Makefile.inc Mon Mar 29 23:17:25 2010 (r5316)
@@ -1,4 +1,3 @@
subdirs-y += amd
subdirs-y += intel
subdirs-y += via
-subdirs-y += emulation
Modified: trunk/src/mainboard/emulation/qemu-x86/Kconfig
==============================================================================
--- trunk/src/mainboard/emulation/qemu-x86/Kconfig Mon Mar 29 21:19:16 2010 (r5315)
+++ trunk/src/mainboard/emulation/qemu-x86/Kconfig Mon Mar 29 23:17:25 2010 (r5316)
@@ -2,7 +2,6 @@
bool "QEMU x86"
select ARCH_X86
select SOUTHBRIDGE_INTEL_I82371EB
- select CPU_EMULATION_QEMU_X86
select ROMCC
select HAVE_PIRQ_TABLE
select BOARD_ROMSIZE_KB_256
Modified: trunk/src/mainboard/emulation/qemu-x86/Makefile.inc
==============================================================================
--- trunk/src/mainboard/emulation/qemu-x86/Makefile.inc Mon Mar 29 21:19:16 2010 (r5315)
+++ trunk/src/mainboard/emulation/qemu-x86/Makefile.inc Mon Mar 29 23:17:25 2010 (r5316)
@@ -1 +1,3 @@
ROMCCFLAGS := -mcpu=i386 -O
+
+obj-y += northbridge.o
Modified: trunk/src/mainboard/emulation/qemu-x86/chip.h
==============================================================================
--- trunk/src/mainboard/emulation/qemu-x86/chip.h Mon Mar 29 21:19:16 2010 (r5315)
+++ trunk/src/mainboard/emulation/qemu-x86/chip.h Mon Mar 29 23:17:25 2010 (r5316)
@@ -2,3 +2,10 @@
struct mainboard_config {
};
+
+struct cpu_emulation_qemu_x86_config
+{
+};
+
+extern struct chip_operations cpu_emulation_qemu_x86_ops;
+
Copied and modified: trunk/src/mainboard/emulation/qemu-x86/northbridge.c (from r5315, trunk/src/cpu/emulation/qemu-x86/northbridge.c)
==============================================================================
--- trunk/src/cpu/emulation/qemu-x86/northbridge.c Mon Mar 29 21:19:16 2010 (r5315, copy source)
+++ trunk/src/mainboard/emulation/qemu-x86/northbridge.c Mon Mar 29 23:17:25 2010 (r5316)
@@ -7,7 +7,6 @@
#include <string.h>
#include <bitops.h>
#include "chip.h"
-#include "northbridge.h"
#include <delay.h>
static void ram_resource(device_t dev, unsigned long index,
Modified: trunk/src/mainboard/emulation/qemu-x86/romstage.c
==============================================================================
--- trunk/src/mainboard/emulation/qemu-x86/romstage.c Mon Mar 29 21:19:16 2010 (r5315)
+++ trunk/src/mainboard/emulation/qemu-x86/romstage.c Mon Mar 29 23:17:25 2010 (r5316)
@@ -1,6 +1,5 @@
#define ASSEMBLY 1
-
#include <stdint.h>
#include <device/pci_def.h>
#include <device/pci_ids.h>
@@ -19,7 +18,7 @@
static void main(void)
{
/* init_timer();*/
- outb(5, 0x80);
+ post_code(0x05);
uart_init();
console_init();
More information about the coreboot
mailing list