[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 109/142] meson: convert hw/acpi
From: |
Paolo Bonzini |
Subject: |
[PATCH 109/142] meson: convert hw/acpi |
Date: |
Tue, 28 Jan 2020 18:53:09 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/acpi/Makefile.objs | 24 ------------------------
hw/acpi/meson.build | 22 ++++++++++++++++++++++
hw/meson.build | 1 +
4 files changed, 23 insertions(+), 25 deletions(-)
delete mode 100644 hw/acpi/Makefile.objs
create mode 100644 hw/acpi/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 5823867997..3dc4decfb5 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,6 +1,5 @@
ifeq ($(CONFIG_SOFTMMU), y)
devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call
land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
-devices-dirs-y += acpi/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
deleted file mode 100644
index 99253057e1..0000000000
--- a/hw/acpi/Makefile.objs
+++ /dev/null
@@ -1,24 +0,0 @@
-ifeq ($(CONFIG_ACPI),y)
-common-obj-$(CONFIG_ACPI_X86) += core.o piix4.o pcihp.o
-common-obj-$(CONFIG_ACPI_X86_ICH) += ich9.o tco.o
-common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
-common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
-common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
-common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
-common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
-common-obj-$(CONFIG_ACPI_HW_REDUCED) += generic_event_device.o
-common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
-common-obj-$(call lnot,$(CONFIG_PC)) += acpi-x86-stub.o
-
-common-obj-y += acpi_interface.o
-common-obj-y += bios-linker-loader.o
-common-obj-y += aml-build.o utils.o
-common-obj-$(CONFIG_ACPI_PCI) += pci.o
-common-obj-$(CONFIG_TPM) += tpm.o
-
-common-obj-$(CONFIG_IPMI) += ipmi.o
-common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o
-else
-common-obj-y += acpi-stub.o
-endif
-common-obj-$(CONFIG_ALL) += acpi-stub.o acpi-x86-stub.o ipmi-stub.o
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
new file mode 100644
index 0000000000..356f50705f
--- /dev/null
+++ b/hw/acpi/meson.build
@@ -0,0 +1,22 @@
+acpi_ss = ss.source_set()
+acpi_ss.add(files(
+ 'acpi_interface.c',
+ 'aml-build.c',
+ 'bios-linker-loader.c',
+ 'utils.c',
+))
+acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu_hotplug.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_true:
files('memory_hotplug.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_true: files('nvdimm.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true:
files('generic_event_device.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_X86', if_true: files('core.c', 'piix4.c',
'pcihp.c'), if_false: files('acpi-stub.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('ich9.c', 'tco.c'))
+acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false:
files('ipmi-stub.c'))
+acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
+acpi_ss.add(when: 'CONFIG_TPM', if_true: files('tpm.c'))
+softmmu_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c'))
+softmmu_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
+softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c',
'acpi-x86-stub.c', 'ipmi-stub.c'))
diff --git a/hw/meson.build b/hw/meson.build
index ffa3f06dc0..55ca2b2b61 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('acpi')
subdir('adc')
subdir('audio')
subdir('block')
--
2.21.0
- [PATCH 099/142] meson: convert hw/i2c, (continued)
- [PATCH 099/142] meson: convert hw/i2c, Paolo Bonzini, 2020/01/28
- [PATCH 100/142] meson: convert hw/hyperv, Paolo Bonzini, 2020/01/28
- [PATCH 101/142] meson: convert hw/gpio, Paolo Bonzini, 2020/01/28
- [PATCH 102/142] meson: convert hw/dma, Paolo Bonzini, 2020/01/28
- [PATCH 103/142] meson: convert hw/display, Paolo Bonzini, 2020/01/28
- [PATCH 104/142] meson: convert hw/cpu, Paolo Bonzini, 2020/01/28
- [PATCH 105/142] meson: convert hw/char, Paolo Bonzini, 2020/01/28
- [PATCH 106/142] meson: convert hw/block, Paolo Bonzini, 2020/01/28
- [PATCH 107/142] meson: convert hw/audio, Paolo Bonzini, 2020/01/28
- [PATCH 108/142] meson: convert hw/adc, Paolo Bonzini, 2020/01/28
- [PATCH 109/142] meson: convert hw/acpi,
Paolo Bonzini <=
- [PATCH 110/142] meson: convert hw/9pfs, Paolo Bonzini, 2020/01/28
- [PATCH 113/142] meson: accel, Paolo Bonzini, 2020/01/28
- [PATCH 111/142] meson: convert hw/arch*, Paolo Bonzini, 2020/01/28
- [PATCH 114/142] meson: linux-user, Paolo Bonzini, 2020/01/28
- [PATCH 115/142] meson: bsd-user, Paolo Bonzini, 2020/01/28
- [PATCH 112/142] meson: target, Paolo Bonzini, 2020/01/28
- [PATCH 116/142] meson: cpu-emu, Paolo Bonzini, 2020/01/28
- [PATCH 117/142] meson: softmmu, Paolo Bonzini, 2020/01/28
- [PATCH 118/142] meson: plugins, Paolo Bonzini, 2020/01/28
- [PATCH 120/142] meson: generate systemtap tapset files, Paolo Bonzini, 2020/01/28