[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 094/142] meson: convert hw/ipmi
From: |
Paolo Bonzini |
Subject: |
[PATCH 094/142] meson: convert hw/ipmi |
Date: |
Tue, 28 Jan 2020 18:52:54 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/ipmi/Makefile.objs | 8 --------
hw/ipmi/meson.build | 11 +++++++++++
hw/meson.build | 1 +
4 files changed, 12 insertions(+), 9 deletions(-)
delete mode 100644 hw/ipmi/Makefile.objs
create mode 100644 hw/ipmi/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index e5f4308436..a2744ad4b9 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -15,7 +15,6 @@ devices-dirs-y += ide/
devices-dirs-y += input/
devices-dirs-y += intc/
devices-dirs-$(CONFIG_IPACK) += ipack/
-devices-dirs-$(CONFIG_IPMI) += ipmi/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/ipmi/Makefile.objs b/hw/ipmi/Makefile.objs
deleted file mode 100644
index 3cca10bc50..0000000000
--- a/hw/ipmi/Makefile.objs
+++ /dev/null
@@ -1,8 +0,0 @@
-common-obj-$(CONFIG_IPMI) += ipmi.o ipmi_kcs.o ipmi_bt.o
-common-obj-$(CONFIG_IPMI_LOCAL) += ipmi_bmc_sim.o
-common-obj-$(CONFIG_IPMI_EXTERN) += ipmi_bmc_extern.o
-common-obj-$(CONFIG_ISA_IPMI_KCS) += isa_ipmi_kcs.o
-common-obj-$(CONFIG_PCI_IPMI_KCS) += pci_ipmi_kcs.o
-common-obj-$(CONFIG_ISA_IPMI_BT) += isa_ipmi_bt.o
-common-obj-$(CONFIG_PCI_IPMI_BT) += pci_ipmi_bt.o
-common-obj-$(CONFIG_IPMI_SSIF) += smbus_ipmi.o
diff --git a/hw/ipmi/meson.build b/hw/ipmi/meson.build
new file mode 100644
index 0000000000..9622ea2a2c
--- /dev/null
+++ b/hw/ipmi/meson.build
@@ -0,0 +1,11 @@
+ipmi_ss = ss.source_set()
+ipmi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c', 'ipmi_kcs.c',
'ipmi_bt.c'))
+ipmi_ss.add(when: 'CONFIG_IPMI_LOCAL', if_true: files('ipmi_bmc_sim.c'))
+ipmi_ss.add(when: 'CONFIG_IPMI_EXTERN', if_true: files('ipmi_bmc_extern.c'))
+ipmi_ss.add(when: 'CONFIG_ISA_IPMI_KCS', if_true: files('isa_ipmi_kcs.c'))
+ipmi_ss.add(when: 'CONFIG_PCI_IPMI_KCS', if_true: files('pci_ipmi_kcs.c'))
+ipmi_ss.add(when: 'CONFIG_ISA_IPMI_BT', if_true: files('isa_ipmi_bt.c'))
+ipmi_ss.add(when: 'CONFIG_PCI_IPMI_BT', if_true: files('pci_ipmi_bt.c'))
+ipmi_ss.add(when: 'CONFIG_IPMI_SSIF', if_true: files('smbus_ipmi.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_IPMI', if_true: ipmi_ss)
diff --git a/hw/meson.build b/hw/meson.build
index 86598544e6..9796f95e5c 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('ipmi')
subdir('isa')
subdir('mem')
subdir('misc')
--
2.21.0
- [PATCH 084/142] meson: convert hw/scsi, (continued)
- [PATCH 084/142] meson: convert hw/scsi, Paolo Bonzini, 2020/01/28
- [PATCH 085/142] meson: convert hw/pcmcia, Paolo Bonzini, 2020/01/28
- [PATCH 086/142] meson: convert hw/pci-host, Paolo Bonzini, 2020/01/28
- [PATCH 087/142] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/01/28
- [PATCH 088/142] meson: convert hw/pci, Paolo Bonzini, 2020/01/28
- [PATCH 089/142] meson: convert hw/nvram, Paolo Bonzini, 2020/01/28
- [PATCH 090/142] meson: convert hw/rdma, Paolo Bonzini, 2020/01/28
- [PATCH 091/142] meson: convert hw/net, Paolo Bonzini, 2020/01/28
- [PATCH 092/142] meson: convert hw/misc, Paolo Bonzini, 2020/01/28
- [PATCH 093/142] meson: convert hw/isa, Paolo Bonzini, 2020/01/28
- [PATCH 094/142] meson: convert hw/ipmi,
Paolo Bonzini <=
- [PATCH 095/142] meson: convert hw/ipack, Paolo Bonzini, 2020/01/28
- [PATCH 096/142] meson: convert hw/intc, Paolo Bonzini, 2020/01/28
- [PATCH 097/142] meson: convert hw/input, Paolo Bonzini, 2020/01/28
- [PATCH 098/142] meson: convert hw/ide, Paolo Bonzini, 2020/01/28
- [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