The GT-64120 is a north-bridge, and it is not MIPS specific. Move it with the other north-bridge devices.
We move this device in the common-obj, and compile it once for the 4 different MIPS targets. Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org> --- hw/{mips/gt64xxx_pci.c => pci-host/gt64120.c} | 0 MAINTAINERS | 2 +- hw/mips/Makefile.objs | 2 +- hw/mips/trace-events | 4 ---- hw/pci-host/Makefile.objs | 2 +- hw/pci-host/trace-events | 5 +++++ 6 files changed, 8 insertions(+), 7 deletions(-) rename hw/{mips/gt64xxx_pci.c => pci-host/gt64120.c} (100%) diff --git a/hw/mips/gt64xxx_pci.c b/hw/pci-host/gt64120.c similarity index 100% rename from hw/mips/gt64xxx_pci.c rename to hw/pci-host/gt64120.c diff --git a/MAINTAINERS b/MAINTAINERS index abef4a1cfc..da348e1af1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -928,7 +928,7 @@ M: Aurelien Jarno <aurel...@aurel32.net> R: Aleksandar Rikalo <arik...@wavecomp.com> S: Maintained F: hw/mips/mips_malta.c -F: hw/mips/gt64xxx_pci.c +F: hw/pci-host/gt64120.c F: tests/acceptance/linux_ssh_mips_malta.py Mipssim diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 525809af07..da65e19c20 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,6 +1,6 @@ obj-y += addr.o mips_int.o obj-$(CONFIG_R4K) += mips_r4k.o -obj-$(CONFIG_MALTA) += gt64xxx_pci.o mips_malta.o +obj-$(CONFIG_MALTA) += mips_malta.o obj-$(CONFIG_MIPSSIM) += mips_mipssim.o obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_FULONG) += mips_fulong2e.o diff --git a/hw/mips/trace-events b/hw/mips/trace-events index 75d4c73f2e..e69de29bb2 100644 --- a/hw/mips/trace-events +++ b/hw/mips/trace-events @@ -1,4 +0,0 @@ -# gt64xxx.c -gt64120_read(const char *regname, int width, uint64_t value) "gt64120 read %s value:0x%0*" PRIx64 -gt64120_write(const char *regname, int width, uint64_t value) "gt64120 write %s value:0x%0*" PRIx64 -gt64120_isd_remap(uint64_t from_length, uint64_t from_addr, uint64_t to_length, uint64_t to_addr) "ISD: 0x%08" PRIx64 "@0x%08" PRIx64 " -> 0x%08" PRIx64 "@0x%08" PRIx64 diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index a9cd3e022d..3e1657774d 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -17,5 +17,5 @@ common-obj-$(CONFIG_PCI_PIIX) += piix.o common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o common-obj-$(CONFIG_PCI_EXPRESS_XILINX) += xilinx-pcie.o - +common-obj-$(CONFIG_MALTA) += gt64120.o common-obj-$(CONFIG_PCI_EXPRESS_DESIGNWARE) += designware.o diff --git a/hw/pci-host/trace-events b/hw/pci-host/trace-events index d19ca9aef6..eecc233670 100644 --- a/hw/pci-host/trace-events +++ b/hw/pci-host/trace-events @@ -20,3 +20,8 @@ unin_data_write(uint64_t addr, unsigned len, uint64_t val) "write addr 0x%"PRIx6 unin_data_read(uint64_t addr, unsigned len, uint64_t val) "read addr 0x%"PRIx64 " len %d val 0x%"PRIx64 unin_write(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64 unin_read(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64 + +# gt64120.c +gt64120_read(const char *regname, int width, uint64_t value) "gt64120 read %s value:0x%0*" PRIx64 +gt64120_write(const char *regname, int width, uint64_t value) "gt64120 write %s value:0x%0*" PRIx64 +gt64120_isd_remap(uint64_t from_length, uint64_t from_addr, uint64_t to_length, uint64_t to_addr) "ISD: 0x%08" PRIx64 "@0x%08" PRIx64 " -> 0x%08" PRIx64 "@0x%08" PRIx64 -- 2.19.1