diff options
| author | Philippe Mathieu-Daudé <f4bug@amsat.org> | 2017-09-20 16:49:29 -0300 |
|---|---|---|
| committer | Yongbok Kim <yongbok.kim@imgtec.com> | 2017-09-21 13:24:34 +0100 |
| commit | 5502b66fc7d0bebd08b9b7017cb7e8b5261c3a2d (patch) | |
| tree | 49bb5858296ea9d548f781bce5843851608deed6 | |
| parent | ff5667ed53c544c4dc88dcd7cb23cc509c9a55e0 (diff) | |
mips: move hw/mips/cputimer.c to target/mips/
This timer is a required part of the MIPS32/MIPS64 System Control coprocessor
(CP0). Moving it with the other architecture related files will allow an opaque
use of CPUMIPSState* in the next commit (introduce "internal.h").
also remove it from 'user' targets, remove an unnecessary include.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Igor Mammedov <imammedo@redhat.com>
Tested-by: James Hogan <james.hogan@imgtec.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Yongbok Kim <yongbok.kim@imgtec.com>
| -rw-r--r-- | hw/mips/Makefile.objs | 2 | ||||
| -rw-r--r-- | target/mips/Makefile.objs | 2 | ||||
| -rw-r--r-- | target/mips/cp0_timer.c (renamed from hw/mips/cputimer.c) | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 48cd2ef50e..17a311aaba 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,5 +1,5 @@ obj-y += mips_r4k.o mips_malta.o mips_mipssim.o -obj-y += addr.o cputimer.o mips_int.o +obj-y += addr.o mips_int.o obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_FULONG) += mips_fulong2e.o obj-y += gt64xxx_pci.o diff --git a/target/mips/Makefile.objs b/target/mips/Makefile.objs index bc5ed8511f..651f36f517 100644 --- a/target/mips/Makefile.objs +++ b/target/mips/Makefile.objs @@ -1,4 +1,4 @@ obj-y += translate.o dsp_helper.o op_helper.o lmi_helper.o helper.o cpu.o obj-y += gdbstub.o msa_helper.o mips-semi.o -obj-$(CONFIG_SOFTMMU) += machine.o +obj-$(CONFIG_SOFTMMU) += machine.o cp0_timer.o obj-$(CONFIG_KVM) += kvm.o diff --git a/hw/mips/cputimer.c b/target/mips/cp0_timer.c index 8a166b3ea7..a9a58c5604 100644 --- a/hw/mips/cputimer.c +++ b/target/mips/cp0_timer.c @@ -21,7 +21,6 @@ */ #include "qemu/osdep.h" -#include "hw/hw.h" #include "hw/mips/cpudevs.h" #include "qemu/timer.h" #include "sysemu/kvm.h" |