diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2013-05-31 09:23:26 +0200 |
---|---|---|
committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2013-06-06 20:52:30 +0200 |
commit | cbf30736b60c6076a82ff256b1bd5246a6af83c0 (patch) | |
tree | 1b4de4505787792ff72ec736362f2d909b6b00d2 /src/cpu | |
parent | a53266bee0bf2b4d92090d0194c694853318a370 (diff) | |
download | coreboot-cbf30736b60c6076a82ff256b1bd5246a6af83c0.tar.xz |
qemu: add x86 cpu
This patch adds a qemu x86 cpu chip. It has no initialization function
as this isn't needed on virtual hardware. A virtual machine can have
pretty much any CPU: qemu emulates a wide range of x86 CPUs (try 'qemu
-cpu ? for a list), also with 'qemu -cpu host' the guest will see a cpu
which is (almost) identical to the one on the host machine. So I've
added X86_VENDOR_ANY as wildcard match for the cpu_table.
Change-Id: Ib01210694b09702e41ed806f31d0033e840a863f
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-on: http://review.coreboot.org/3344
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/cpu')
-rw-r--r-- | src/cpu/Kconfig | 1 | ||||
-rw-r--r-- | src/cpu/Makefile.inc | 1 | ||||
-rw-r--r-- | src/cpu/qemu-x86/Kconfig | 21 | ||||
-rw-r--r-- | src/cpu/qemu-x86/Makefile.inc | 21 | ||||
-rw-r--r-- | src/cpu/qemu-x86/qemu.c | 37 |
5 files changed, 81 insertions, 0 deletions
diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index dd28cb7ff8..d1e52376dd 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -14,6 +14,7 @@ if ARCH_X86 source src/cpu/amd/Kconfig source src/cpu/intel/Kconfig source src/cpu/via/Kconfig +source src/cpu/qemu-x86/Kconfig source src/cpu/x86/Kconfig config CACHE_AS_RAM diff --git a/src/cpu/Makefile.inc b/src/cpu/Makefile.inc index 25ef424f35..8b9d0747c8 100644 --- a/src/cpu/Makefile.inc +++ b/src/cpu/Makefile.inc @@ -8,6 +8,7 @@ subdirs-y += samsung subdirs-y += ti subdirs-y += via subdirs-y += x86 +subdirs-$(CONFIG_CPU_QEMU_X86) += qemu-x86 ################################################################################ ## Rules for building the microcode blob in CBFS diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig new file mode 100644 index 0000000000..6c5c3fd4d4 --- /dev/null +++ b/src/cpu/qemu-x86/Kconfig @@ -0,0 +1,21 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2013 Gerd Hoffmann <kraxel@redhat.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; version 2 of the License. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +config CPU_QEMU_X86 + bool diff --git a/src/cpu/qemu-x86/Makefile.inc b/src/cpu/qemu-x86/Makefile.inc new file mode 100644 index 0000000000..e206b4d72f --- /dev/null +++ b/src/cpu/qemu-x86/Makefile.inc @@ -0,0 +1,21 @@ +## +## This file is part of the coreboot project. +## +## 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. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +ramstage-y += qemu.c +subdirs-y += ../x86/mtrr +subdirs-y += ../x86/lapic diff --git a/src/cpu/qemu-x86/qemu.c b/src/cpu/qemu-x86/qemu.c new file mode 100644 index 0000000000..c27a1eeed7 --- /dev/null +++ b/src/cpu/qemu-x86/qemu.c @@ -0,0 +1,37 @@ +/* + * This file is part of the coreboot project. + * + * 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. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <cpu/cpu.h> +#include <device/device.h> + +static struct device_operations cpu_dev_ops = { +}; + +static struct cpu_device_id cpu_table[] = { + { X86_VENDOR_ANY, 0 }, + { 0, 0 }, +}; + +static const struct cpu_driver driver __cpu_driver = { + .ops = &cpu_dev_ops, + .id_table = cpu_table, +}; + +struct chip_operations cpu_x86_qemu_ops = { + CHIP_NAME("QEMU x86 CPU") +}; |