[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 085/132] meson: convert hw/isa
|
From: |
Paolo Bonzini |
|
Subject: |
[PATCH 085/132] meson: convert hw/isa |
|
Date: |
Thu, 12 Dec 2019 13:52:09 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/isa/Makefile.objs | 10 ----------
hw/isa/meson.build | 9 +++++++++
hw/meson.build | 1 +
4 files changed, 10 insertions(+), 11 deletions(-)
delete mode 100644 hw/isa/Makefile.objs
create mode 100644 hw/isa/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index e630c54..1dd9f63 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -17,7 +17,6 @@ devices-dirs-y += input/
devices-dirs-y += intc/
devices-dirs-$(CONFIG_IPACK) += ipack/
devices-dirs-$(CONFIG_IPMI) += ipmi/
-devices-dirs-y += isa/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/isa/Makefile.objs b/hw/isa/Makefile.objs
deleted file mode 100644
index 9e106df..0000000
--- a/hw/isa/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-common-obj-$(CONFIG_ISA_BUS) += isa-bus.o
-common-obj-$(CONFIG_ISA_BUS) += isa-superio.o
-common-obj-$(CONFIG_APM) += apm.o
-common-obj-$(CONFIG_I82378) += i82378.o
-common-obj-$(CONFIG_PC87312) += pc87312.o
-common-obj-$(CONFIG_PIIX4) += piix4.o
-common-obj-$(CONFIG_VT82C686) += vt82c686.o
-common-obj-$(CONFIG_SMC37C669) += smc37c669-superio.o
-
-obj-$(CONFIG_LPC_ICH9) += lpc_ich9.o
diff --git a/hw/isa/meson.build b/hw/isa/meson.build
new file mode 100644
index 0000000..729f799
--- /dev/null
+++ b/hw/isa/meson.build
@@ -0,0 +1,9 @@
+softmmu_ss.add(when: 'CONFIG_APM', if_true: files('apm.c'))
+softmmu_ss.add(when: 'CONFIG_I82378', if_true: files('i82378.c'))
+softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('isa-bus.c',
'isa-superio.c'))
+softmmu_ss.add(when: 'CONFIG_PC87312', if_true: files('pc87312.c'))
+softmmu_ss.add(when: 'CONFIG_PIIX4', if_true: files('piix4.c'))
+softmmu_ss.add(when: 'CONFIG_SMC37C669', if_true: files('smc37c669-superio.c'))
+softmmu_ss.add(when: 'CONFIG_VT82C686', if_true: files('vt82c686.c'))
+
+specific_ss.add(when: 'CONFIG_LPC_ICH9', if_true: files('lpc_ich9.c'))
diff --git a/hw/meson.build b/hw/meson.build
index c83f37c..db35232 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('isa')
subdir('mem')
subdir('misc')
subdir('net')
--
1.8.3.1
- [PATCH 074/132] meson: convert hw/ssi, (continued)
- [PATCH 074/132] meson: convert hw/ssi, Paolo Bonzini, 2019/12/12
- [PATCH 075/132] meson: convert hw/sd, Paolo Bonzini, 2019/12/12
- [PATCH 076/132] meson: convert hw/scsi, Paolo Bonzini, 2019/12/12
- [PATCH 078/132] meson: convert hw/pci-host, Paolo Bonzini, 2019/12/12
- [PATCH 077/132] meson: convert hw/pcmcia, Paolo Bonzini, 2019/12/12
- [PATCH 079/132] meson: convert hw/pci-bridge, Paolo Bonzini, 2019/12/12
- [PATCH 080/132] meson: convert hw/pci, Paolo Bonzini, 2019/12/12
- [PATCH 081/132] meson: convert hw/nvram, Paolo Bonzini, 2019/12/12
- [PATCH 082/132] meson: convert hw/rdma, Paolo Bonzini, 2019/12/12
- [PATCH 083/132] meson: convert hw/net, Paolo Bonzini, 2019/12/12
- [PATCH 085/132] meson: convert hw/isa,
Paolo Bonzini <=
- [PATCH 084/132] meson: convert hw/misc, Paolo Bonzini, 2019/12/12
- [PATCH 086/132] meson: convert hw/ipmi, Paolo Bonzini, 2019/12/12
- [PATCH 087/132] meson: convert hw/ipack, Paolo Bonzini, 2019/12/12
- [PATCH 088/132] meson: convert hw/intc, Paolo Bonzini, 2019/12/12
- [PATCH 089/132] meson: convert hw/input, Paolo Bonzini, 2019/12/12
- [PATCH 090/132] meson: convert hw/ide, Paolo Bonzini, 2019/12/12
- [PATCH 092/132] meson: convert hw/hyperv, Paolo Bonzini, 2019/12/12
- [PATCH 091/132] meson: convert hw/i2c, Paolo Bonzini, 2019/12/12
- [PATCH 093/132] meson: convert hw/gpio, Paolo Bonzini, 2019/12/12
- Re: [RFC PATCH v3 000/132] Proof of concept for Meson integration, Markus Armbruster, 2019/12/19