aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2010-03-21 19:47:14 +0000
committerBlue Swirl <blauwirbel@gmail.com>2010-03-21 19:47:14 +0000
commitc1f63a9d43f294d53e5f78f3534e5b8198e1fa74 (patch)
tree93d3c21b8e41895d14c1510a88aab631fd76a588
parent6842a08ee0f59dd00adcd51fda4705c412b6a0dd (diff)
Compile pcie_host only once
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--Makefile.objs2
-rw-r--r--Makefile.target2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.objs b/Makefile.objs
index dd33ca4c78..11dbc62a2d 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -129,7 +129,7 @@ user-obj-y += cutils.o cache-utils.o
hw-obj-y =
hw-obj-y += loader.o
hw-obj-y += virtio.o virtio-console.o
-hw-obj-y += fw_cfg.o pci.o
+hw-obj-y += fw_cfg.o pci.o pcie_host.o
hw-obj-y += watchdog.o
hw-obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
hw-obj-$(CONFIG_ECC) += ecc.o
diff --git a/Makefile.target b/Makefile.target
index fc8589c462..b1d6a7f1c9 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -161,7 +161,7 @@ endif #CONFIG_BSD_USER
# System emulator target
ifdef CONFIG_SOFTMMU
-obj-y = vl.o monitor.o pci_host.o pcie_host.o machine.o gdbstub.o
+obj-y = vl.o monitor.o pci_host.o machine.o gdbstub.o
obj-y += qemu-timer.o
# virtio has to be here due to weird dependency between PCI and virtio-net.
# need to fix this properly