From: Philippe Mathieu-Daudé Date: Wed, 20 Sep 2017 19:49:29 +0000 (-0300) Subject: mips: move hw/mips/cputimer.c to target/mips/ X-Git-Tag: v2.11.0-rc0~91^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5502b66fc7d0bebd08b9b7017cb7e8b5261c3a2d;p=thirdparty%2Fqemu.git 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é Tested-by: Igor Mammedov Tested-by: James Hogan Acked-by: Eduardo Habkost Signed-off-by: Yongbok Kim --- diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 48cd2ef50e6..17a311aaba3 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 bc5ed8511f8..651f36f5176 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 similarity index 99% rename from hw/mips/cputimer.c rename to target/mips/cp0_timer.c index 8a166b3ea74..a9a58c56045 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"