[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 096/150] meson: convert hw/rtc
From: |
Paolo Bonzini |
Subject: |
[PATCH 096/150] meson: convert hw/rtc |
Date: |
Mon, 17 Aug 2020 16:39:59 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/rtc/Makefile.objs | 15 ---------------
hw/rtc/meson.build | 16 ++++++++++++++++
4 files changed, 17 insertions(+), 16 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 70ecaa8135..f60fd019ac 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 e4c1b8617c..0000000000
--- a/hw/rtc/Makefile.objs
+++ /dev/null
@@ -1,15 +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
-common-obj-$(CONFIG_GOLDFISH_RTC) += goldfish_rtc.o
-common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-rtc.o
diff --git a/hw/rtc/meson.build b/hw/rtc/meson.build
new file mode 100644
index 0000000000..7cecdee5dd
--- /dev/null
+++ b/hw/rtc/meson.build
@@ -0,0 +1,16 @@
+
+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'))
+softmmu_ss.add(when: 'CONFIG_GOLDFISH_RTC', if_true: files('goldfish_rtc.c'))
+softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-rtc.c'))
+
+specific_ss.add(when: 'CONFIG_MC146818RTC', if_true: files('mc146818rtc.c'))
--
2.26.2
- [PATCH 089/150] meson: convert hw/mem, (continued)
- [PATCH 089/150] meson: convert hw/mem, Paolo Bonzini, 2020/08/17
- [PATCH 090/150] meson: convert hw/watchdog, Paolo Bonzini, 2020/08/17
- [PATCH 091/150] meson: convert hw/virtio, Paolo Bonzini, 2020/08/17
- [PATCH 092/150] meson: convert hw/vfio, Paolo Bonzini, 2020/08/17
- [PATCH 094/150] meson: convert hw/tpm, Paolo Bonzini, 2020/08/17
- [PATCH 093/150] meson: convert hw/usb, Paolo Bonzini, 2020/08/17
- [PATCH 095/150] meson: convert hw/timer, Paolo Bonzini, 2020/08/17
- [PATCH 096/150] meson: convert hw/rtc,
Paolo Bonzini <=
- [PATCH 097/150] meson: convert hw/ssi, Paolo Bonzini, 2020/08/17
- [PATCH 098/150] meson: convert hw/sd, Paolo Bonzini, 2020/08/17
- [PATCH 099/150] meson: convert hw/scsi, Paolo Bonzini, 2020/08/17
- [PATCH 100/150] meson: convert hw/pcmcia, Paolo Bonzini, 2020/08/17
- [PATCH 103/150] meson: convert hw/pci, Paolo Bonzini, 2020/08/17
- [PATCH 101/150] meson: convert hw/pci-host, Paolo Bonzini, 2020/08/17
- [PATCH 102/150] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/08/17