diff options
| author | Peter Maydell | 2018-01-25 17:24:55 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-01-25 17:24:56 +0100 |
| commit | a3f9362af5c7071036fafb66665b85fda1e49bcc (patch) | |
| tree | bc66805eb2a71797d9146c1f8590f184bf24ff11 /hw/pci-host/Makefile.objs | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20180125-pull-request' ... (diff) | |
| parent | sun4u: implement power device (diff) | |
| download | qemu-a3f9362af5c7071036fafb66665b85fda1e49bcc.tar.gz qemu-a3f9362af5c7071036fafb66665b85fda1e49bcc.tar.xz qemu-a3f9362af5c7071036fafb66665b85fda1e49bcc.zip | |
Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging
qemu-sparc update
# gpg: Signature made Thu 25 Jan 2018 13:44:58 GMT
# gpg: using RSA key 0x5BC2C56FAE0F321F
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* remotes/mcayland/tags/qemu-sparc-signed:
sun4u: implement power device
sparc64: convert hw/sparc64/sparc64.c from DPRINTF macros to trace events
sabre: convert from SABRE_DPRINTF macro to trace-events
apb: rename apb.c to sabre.c
sun4u: rename apb variables and constants
apb: rename QOM type from TYPE_APB to TYPE_SABRE
apb: QOMify sabre PCI host bridge
apb: change pbm_pci_host prefix functions to use sabre_pci prefix
apb: rename APB functions to use sabre prefix
simba: rename PBMPCIBridge and QOM types to reflect simba naming
apb: split simba PCI bridge into hw/pci-bridge/simba.c
sparc/leon3 irqmp: fix IRQ software ack
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/pci-host/Makefile.objs')
| -rw-r--r-- | hw/pci-host/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index 9c7909cf44..4b69f737b5 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -11,7 +11,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o # ARM devices common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o -common-obj-$(CONFIG_PCI_APB) += apb.o +common-obj-$(CONFIG_PCI_SABRE) += sabre.o common-obj-$(CONFIG_FULONG) += bonito.o common-obj-$(CONFIG_PCI_PIIX) += piix.o common-obj-$(CONFIG_PCI_Q35) += q35.o |