[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 068/132] meson: convert hw/watchdog
From: |
Paolo Bonzini |
Subject: |
[PATCH 068/132] meson: convert hw/watchdog |
Date: |
Thu, 12 Dec 2019 13:51:52 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/meson.build | 1 +
hw/watchdog/Makefile.objs | 6 ------
hw/watchdog/meson.build | 6 ++++++
4 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 hw/watchdog/Makefile.objs
create mode 100644 hw/watchdog/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index b91472b..a1d3f07 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -33,7 +33,6 @@ devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-y += usb/
devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
-devices-dirs-y += watchdog/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index d788be4..376dbef 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -2,4 +2,5 @@ subdir('core')
subdir('mem')
subdir('semihosting')
subdir('smbios')
+subdir('watchdog')
subdir('xen')
diff --git a/hw/watchdog/Makefile.objs b/hw/watchdog/Makefile.objs
deleted file mode 100644
index 3f536d1..0000000
--- a/hw/watchdog/Makefile.objs
+++ /dev/null
@@ -1,6 +0,0 @@
-common-obj-y += watchdog.o
-common-obj-$(CONFIG_CMSDK_APB_WATCHDOG) += cmsdk-apb-watchdog.o
-common-obj-$(CONFIG_WDT_IB6300ESB) += wdt_i6300esb.o
-common-obj-$(CONFIG_WDT_IB700) += wdt_ib700.o
-common-obj-$(CONFIG_WDT_DIAG288) += wdt_diag288.o
-common-obj-$(CONFIG_ASPEED_SOC) += wdt_aspeed.o
diff --git a/hw/watchdog/meson.build b/hw/watchdog/meson.build
new file mode 100644
index 0000000..eafb57b
--- /dev/null
+++ b/hw/watchdog/meson.build
@@ -0,0 +1,6 @@
+softmmu_ss.add(files('watchdog.c'))
+softmmu_ss.add(when: 'CONFIG_CMSDK_APB_WATCHDOG', if_true:
files('cmsdk-apb-watchdog.c'))
+softmmu_ss.add(when: 'CONFIG_WDT_IB6300ESB', if_true: files('wdt_i6300esb.c'))
+softmmu_ss.add(when: 'CONFIG_WDT_IB700', if_true: files('wdt_ib700.c'))
+softmmu_ss.add(when: 'CONFIG_WDT_DIAG288', if_true: files('wdt_diag288.c'))
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('wdt_aspeed.c'))
--
1.8.3.1
- [PATCH 057/132] meson: build softmmu-specific migration/ram.c, (continued)
- [PATCH 057/132] meson: build softmmu-specific migration/ram.c, Paolo Bonzini, 2019/12/12
- [PATCH 059/132] meson: convert backends directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 058/132] meson: convert net directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 060/132] meson: convert fsdev/, Paolo Bonzini, 2019/12/12
- [PATCH 061/132] meson: convert disas directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 063/132] meson: convert hw/xen, Paolo Bonzini, 2019/12/12
- [PATCH 062/132] meson: convert qapi-specific to meson, Paolo Bonzini, 2019/12/12
- [PATCH 064/132] meson: convert hw/core, Paolo Bonzini, 2019/12/12
- [PATCH 065/132] meson: convert hw/semihosting, Paolo Bonzini, 2019/12/12
- [PATCH 066/132] meson: convert hw/smbios, Paolo Bonzini, 2019/12/12
- [PATCH 068/132] meson: convert hw/watchdog,
Paolo Bonzini <=
- [PATCH 067/132] meson: convert hw/mem, Paolo Bonzini, 2019/12/12
- [PATCH 069/132] meson: convert hw/virtio, Paolo Bonzini, 2019/12/12
- [PATCH 070/132] meson: convert hw/vfio, Paolo Bonzini, 2019/12/12
- [PATCH 072/132] meson: convert hw/tpm, Paolo Bonzini, 2019/12/12
- [PATCH 071/132] meson: convert hw/usb, Paolo Bonzini, 2019/12/12
- [PATCH 073/132] meson: convert hw/timer, Paolo Bonzini, 2019/12/12
- [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