diff options
| -rw-r--r-- | src/cpu/Kconfig | 1 | ||||
| -rw-r--r-- | src/cpu/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/cpu/emulation/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/emulation/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/cpu/emulation/qemu-x86/Kconfig | 3 | ||||
| -rw-r--r-- | src/cpu/emulation/qemu-x86/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/cpu/emulation/qemu-x86/chip.h | 6 | ||||
| -rw-r--r-- | src/cpu/emulation/qemu-x86/northbridge.h | 5 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/chip.h | 7 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/northbridge.c (renamed from src/cpu/emulation/qemu-x86/northbridge.c) | 1 | ||||
| -rw-r--r-- | src/mainboard/emulation/qemu-x86/romstage.c | 3 |
13 files changed, 10 insertions, 24 deletions
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index c336185705..c63cf2b52d 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -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 diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index 4e588069a0..57273cf8c3 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -1,4 +1,3 @@ subdirs-y += amd subdirs-y += intel subdirs-y += via -subdirs-y += emulation diff --git a/src/cpu/emulation/Kconfig b/src/cpu/emulation/Kconfig deleted file mode 100644 index 25d55e689b..0000000000 --- a/src/cpu/emulation/Kconfig +++ /dev/null @@ -1,2 +0,0 @@ -source src/cpu/emulation/qemu-x86/Kconfig - diff --git a/src/cpu/emulation/Makefile.inc b/src/cpu/emulation/Makefile.inc deleted file mode 100644 index f98d3854be..0000000000 --- a/src/cpu/emulation/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -subdirs-$(CONFIG_CPU_EMULATION_QEMU_X86) += qemu-x86 diff --git a/src/cpu/emulation/qemu-x86/Kconfig b/src/cpu/emulation/qemu-x86/Kconfig deleted file mode 100644 index dd7fcef78c..0000000000 --- a/src/cpu/emulation/qemu-x86/Kconfig +++ /dev/null @@ -1,3 +0,0 @@ -config CPU_EMULATION_QEMU_X86 - bool - diff --git a/src/cpu/emulation/qemu-x86/Makefile.inc b/src/cpu/emulation/qemu-x86/Makefile.inc deleted file mode 100644 index ea44b26cbe..0000000000 --- a/src/cpu/emulation/qemu-x86/Makefile.inc +++ /dev/null @@ -1 +0,0 @@ -obj-y += northbridge.o diff --git a/src/cpu/emulation/qemu-x86/chip.h b/src/cpu/emulation/qemu-x86/chip.h deleted file mode 100644 index 1183200ff7..0000000000 --- a/src/cpu/emulation/qemu-x86/chip.h +++ /dev/null @@ -1,6 +0,0 @@ -struct cpu_emulation_qemu_x86_config -{ -}; - -extern struct chip_operations cpu_emulation_qemu_x86_ops; - diff --git a/src/cpu/emulation/qemu-x86/northbridge.h b/src/cpu/emulation/qemu-x86/northbridge.h deleted file mode 100644 index 9ff688be2f..0000000000 --- a/src/cpu/emulation/qemu-x86/northbridge.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef NORTHBRIDGE_EMULATION_QEMU_X86_H -#define NORTHBRIDGE_EMULATION_QEMU_X86_H - - -#endif /* NORTHBRIDGE_EMULATION_QEMU_X86 */ diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig index 2894c45bec..27a334d073 100644 --- a/src/mainboard/emulation/qemu-x86/Kconfig +++ b/src/mainboard/emulation/qemu-x86/Kconfig @@ -2,7 +2,6 @@ config BOARD_EMULATION_QEMU_X86 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 diff --git a/src/mainboard/emulation/qemu-x86/Makefile.inc b/src/mainboard/emulation/qemu-x86/Makefile.inc index 76784015ba..20ca9771ab 100644 --- a/src/mainboard/emulation/qemu-x86/Makefile.inc +++ b/src/mainboard/emulation/qemu-x86/Makefile.inc @@ -1 +1,3 @@ ROMCCFLAGS := -mcpu=i386 -O + +obj-y += northbridge.o diff --git a/src/mainboard/emulation/qemu-x86/chip.h b/src/mainboard/emulation/qemu-x86/chip.h index 06f11d0862..b9394195d7 100644 --- a/src/mainboard/emulation/qemu-x86/chip.h +++ b/src/mainboard/emulation/qemu-x86/chip.h @@ -2,3 +2,10 @@ extern struct chip_operations mainboard_ops; struct mainboard_config { }; + +struct cpu_emulation_qemu_x86_config +{ +}; + +extern struct chip_operations cpu_emulation_qemu_x86_ops; + diff --git a/src/cpu/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c index d2e5abea91..4184d14a17 100644 --- a/src/cpu/emulation/qemu-x86/northbridge.c +++ b/src/mainboard/emulation/qemu-x86/northbridge.c @@ -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, diff --git a/src/mainboard/emulation/qemu-x86/romstage.c b/src/mainboard/emulation/qemu-x86/romstage.c index f9da1b5188..9739d06eab 100644 --- a/src/mainboard/emulation/qemu-x86/romstage.c +++ b/src/mainboard/emulation/qemu-x86/romstage.c @@ -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(); |