9pfs: fix dependencies
Nothing in fsdev/ or hw/9pfs/ depends on pci; it should rather depend on CONFIG_VIRTFS and CONFIG_VIRTIO/CONFIG_XEN only. Acked-by: Greg Kurz <groug@kaod.org> Reviewed-by: Thomas Huth <thuth@redhat.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
parent
e9a3591fa0
commit
5f8c92e1d5
@ -1,10 +1,7 @@
|
|||||||
ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)
|
|
||||||
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
|
# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.
|
||||||
# only pull in the actual virtio-9p device if we also enabled virtio.
|
# only pull in the actual 9p backend if we also enabled virtio or xen.
|
||||||
common-obj-y = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o
|
common-obj-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) = qemu-fsdev.o 9p-marshal.o 9p-iov-marshal.o
|
||||||
else
|
common-obj-$(call lnot,$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN)))) = qemu-fsdev-dummy.o
|
||||||
common-obj-y = qemu-fsdev-dummy.o
|
|
||||||
endif
|
|
||||||
common-obj-y += qemu-fsdev-opts.o qemu-fsdev-throttle.o
|
common-obj-y += qemu-fsdev-opts.o qemu-fsdev-throttle.o
|
||||||
|
|
||||||
# Toplevel always builds this; targets without virtio will put it in
|
# Toplevel always builds this; targets without virtio will put it in
|
||||||
|
@ -7,4 +7,4 @@ common-obj-$(CONFIG_OPEN_BY_HANDLE) += 9p-handle.o
|
|||||||
common-obj-y += 9p-proxy.o
|
common-obj-y += 9p-proxy.o
|
||||||
common-obj-$(CONFIG_XEN) += xen-9p-backend.o
|
common-obj-$(CONFIG_XEN) += xen-9p-backend.o
|
||||||
|
|
||||||
obj-y += virtio-9p-device.o
|
obj-$(CONFIG_VIRTIO) += virtio-9p-device.o
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
devices-dirs-$(call land, $(CONFIG_VIRTIO),$(call land,$(CONFIG_VIRTFS),$(CONFIG_PCI))) += 9pfs/
|
devices-dirs-$(call land,$(CONFIG_VIRTFS),$(call lor,$(CONFIG_VIRTIO),$(CONFIG_XEN))) += 9pfs/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += acpi/
|
devices-dirs-$(CONFIG_SOFTMMU) += acpi/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += adc/
|
devices-dirs-$(CONFIG_SOFTMMU) += adc/
|
||||||
devices-dirs-$(CONFIG_SOFTMMU) += audio/
|
devices-dirs-$(CONFIG_SOFTMMU) += audio/
|
||||||
|
Loading…
Reference in New Issue
Block a user