[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 081/142] meson: convert hw/rtc
From: |
Paolo Bonzini |
Subject: |
[PATCH 081/142] meson: convert hw/rtc |
Date: |
Tue, 28 Jan 2020 18:52:41 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/rtc/Makefile.objs | 13 -------------
hw/rtc/meson.build | 14 ++++++++++++++
4 files changed, 15 insertions(+), 14 deletions(-)
delete mode 100644 hw/rtc/Makefile.objs
create mode 100644 hw/rtc/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 9df81ac96e..6152f8074b 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -24,7 +24,6 @@ devices-dirs-y += nvram/
devices-dirs-y += pci/
devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-y += pcmcia/
-devices-dirs-y += rtc/
devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-y += sd/
devices-dirs-y += ssi/
diff --git a/hw/meson.build b/hw/meson.build
index 50b26db852..1fb1687e1e 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,6 +1,7 @@
subdir('core')
subdir('mem')
subdir('nubus')
+subdir('rtc')
subdir('semihosting')
subdir('smbios')
subdir('timer')
diff --git a/hw/rtc/Makefile.objs b/hw/rtc/Makefile.objs
deleted file mode 100644
index 8dc9fcd3a9..0000000000
--- a/hw/rtc/Makefile.objs
+++ /dev/null
@@ -1,13 +0,0 @@
-common-obj-$(CONFIG_DS1338) += ds1338.o
-common-obj-$(CONFIG_M41T80) += m41t80.o
-common-obj-$(CONFIG_M48T59) += m48t59.o
-ifeq ($(CONFIG_ISA_BUS),y)
-common-obj-$(CONFIG_M48T59) += m48t59-isa.o
-endif
-common-obj-$(CONFIG_PL031) += pl031.o
-common-obj-$(CONFIG_TWL92230) += twl92230.o
-common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-rtc.o
-common-obj-$(CONFIG_EXYNOS4) += exynos4210_rtc.o
-obj-$(CONFIG_MC146818RTC) += mc146818rtc.o
-common-obj-$(CONFIG_SUN4V_RTC) += sun4v-rtc.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_rtc.o
diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build
new file mode 100644
index 0000000000..665a539a37
--- /dev/null
+++ b/hw/rtc/meson.build
@@ -0,0 +1,14 @@
+
+softmmu_ss.add(when: 'CONFIG_DS1338', if_true: files('ds1338.c'))
+softmmu_ss.add(when: 'CONFIG_M41T80', if_true: files('m41t80.c'))
+softmmu_ss.add(when: 'CONFIG_M48T59', if_true: files('m48t59.c'))
+softmmu_ss.add(when: 'CONFIG_PL031', if_true: files('pl031.c'))
+softmmu_ss.add(when: 'CONFIG_TWL92230', if_true: files('twl92230.c'))
+softmmu_ss.add(when: ['CONFIG_ISA_BUS', 'CONFIG_M48T59'], if_true:
files('m48t59-isa.c'))
+softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP', if_true: files('xlnx-zynqmp-rtc.c'))
+
+softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_rtc.c'))
+softmmu_ss.add(when: 'CONFIG_SUN4V_RTC', if_true: files('sun4v-rtc.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_rtc.c'))
+
+specific_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'))
--
2.21.0
- [PATCH 071/142] meson: convert hw/semihosting, (continued)
- [PATCH 071/142] meson: convert hw/semihosting, Paolo Bonzini, 2020/01/28
- [PATCH 072/142] meson: convert hw/nubus, Paolo Bonzini, 2020/01/28
- [PATCH 073/142] meson: convert hw/smbios, Paolo Bonzini, 2020/01/28
- [PATCH 074/142] meson: convert hw/mem, Paolo Bonzini, 2020/01/28
- [PATCH 075/142] meson: convert hw/watchdog, Paolo Bonzini, 2020/01/28
- [PATCH 076/142] meson: convert hw/virtio, Paolo Bonzini, 2020/01/28
- [PATCH 078/142] meson: convert hw/usb, Paolo Bonzini, 2020/01/28
- [PATCH 079/142] meson: convert hw/tpm, Paolo Bonzini, 2020/01/28
- [PATCH 077/142] meson: convert hw/vfio, Paolo Bonzini, 2020/01/28
- [PATCH 080/142] meson: convert hw/timer, Paolo Bonzini, 2020/01/28
- [PATCH 081/142] meson: convert hw/rtc,
Paolo Bonzini <=
- [PATCH 082/142] meson: convert hw/ssi, Paolo Bonzini, 2020/01/28
- [PATCH 083/142] meson: convert hw/sd, Paolo Bonzini, 2020/01/28
- [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