mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 23:13:30 +00:00
Makefile.target: CONFIG_NO_* variables removed
CONFIG_NO_* variables replaced with the lnot logical function Signed-off-by: Ákos Kovács <akoskovacs@gmx.com> [PMM: fixed a few CONFIG_NO_* uses that were missed] Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
9ef622e31e
commit
cf01ba9eef
|
@ -70,10 +70,6 @@ all: $(PROGS) stap
|
||||||
# Dummy command so that make thinks it has done something
|
# Dummy command so that make thinks it has done something
|
||||||
@true
|
@true
|
||||||
|
|
||||||
CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)
|
|
||||||
CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
|
|
||||||
CONFIG_NO_XEN = $(if $(subst n,,$(CONFIG_XEN)),n,y)
|
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# cpu emulator library
|
# cpu emulator library
|
||||||
obj-y = exec.o translate-all.o cpu-exec.o
|
obj-y = exec.o translate-all.o cpu-exec.o
|
||||||
|
@ -84,7 +80,7 @@ obj-y += fpu/softfloat.o
|
||||||
obj-y += target-$(TARGET_BASE_ARCH)/
|
obj-y += target-$(TARGET_BASE_ARCH)/
|
||||||
obj-y += disas.o
|
obj-y += disas.o
|
||||||
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
|
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
|
||||||
obj-$(CONFIG_NO_KVM) += kvm-stub.o
|
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Linux user emulator target
|
# Linux user emulator target
|
||||||
|
@ -125,7 +121,7 @@ LIBS+=$(libs_softmmu)
|
||||||
|
|
||||||
# xen support
|
# xen support
|
||||||
obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
|
obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o
|
||||||
obj-$(CONFIG_NO_XEN) += xen-stub.o
|
obj-$(call lnot,$(CONFIG_XEN)) += xen-stub.o
|
||||||
|
|
||||||
# Hardware support
|
# Hardware support
|
||||||
ifeq ($(TARGET_NAME), sparc64)
|
ifeq ($(TARGET_NAME), sparc64)
|
||||||
|
|
|
@ -5,7 +5,7 @@ common-obj-$(CONFIG_PCI) += slotid_cap.o
|
||||||
common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
|
common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
|
||||||
common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
|
common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
|
||||||
|
|
||||||
common-obj-$(CONFIG_NO_PCI) += pci-stub.o
|
common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o
|
||||||
common-obj-$(CONFIG_ALL) += pci-stub.o
|
common-obj-$(CONFIG_ALL) += pci-stub.o
|
||||||
|
|
||||||
common-obj-$(CONFIG_PCI_HOTPLUG_OLD) += pci-hotplug-old.o
|
common-obj-$(CONFIG_PCI_HOTPLUG_OLD) += pci-hotplug-old.o
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
obj-y += arm-semi.o
|
obj-y += arm-semi.o
|
||||||
obj-$(CONFIG_SOFTMMU) += machine.o
|
obj-$(CONFIG_SOFTMMU) += machine.o
|
||||||
obj-$(CONFIG_KVM) += kvm.o
|
obj-$(CONFIG_KVM) += kvm.o
|
||||||
obj-$(CONFIG_NO_KVM) += kvm-stub.o
|
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
|
||||||
obj-y += translate.o op_helper.o helper.o cpu.o
|
obj-y += translate.o op_helper.o helper.o cpu.o
|
||||||
obj-y += neon_helper.o iwmmxt_helper.o
|
obj-y += neon_helper.o iwmmxt_helper.o
|
||||||
obj-y += gdbstub.o
|
obj-y += gdbstub.o
|
||||||
|
|
|
@ -4,6 +4,6 @@ obj-y += smm_helper.o misc_helper.o mem_helper.o seg_helper.o
|
||||||
obj-y += gdbstub.o
|
obj-y += gdbstub.o
|
||||||
obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o
|
obj-$(CONFIG_SOFTMMU) += machine.o arch_memory_mapping.o arch_dump.o
|
||||||
obj-$(CONFIG_KVM) += kvm.o
|
obj-$(CONFIG_KVM) += kvm.o
|
||||||
obj-$(CONFIG_NO_KVM) += kvm-stub.o
|
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
|
||||||
obj-$(CONFIG_LINUX_USER) += ioport-user.o
|
obj-$(CONFIG_LINUX_USER) += ioport-user.o
|
||||||
obj-$(CONFIG_BSD_USER) += ioport-user.o
|
obj-$(CONFIG_BSD_USER) += ioport-user.o
|
||||||
|
|
|
@ -5,7 +5,7 @@ obj-y += machine.o mmu_helper.o mmu-hash32.o
|
||||||
obj-$(TARGET_PPC64) += mmu-hash64.o
|
obj-$(TARGET_PPC64) += mmu-hash64.o
|
||||||
endif
|
endif
|
||||||
obj-$(CONFIG_KVM) += kvm.o kvm_ppc.o
|
obj-$(CONFIG_KVM) += kvm.o kvm_ppc.o
|
||||||
obj-$(CONFIG_NO_KVM) += kvm-stub.o
|
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
|
||||||
obj-y += excp_helper.o
|
obj-y += excp_helper.o
|
||||||
obj-y += fpu_helper.o
|
obj-y += fpu_helper.o
|
||||||
obj-y += int_helper.o
|
obj-y += int_helper.o
|
||||||
|
|
Loading…
Reference in a new issue