[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 108/142] meson: convert hw/adc
From: |
Paolo Bonzini |
Subject: |
[PATCH 108/142] meson: convert hw/adc |
Date: |
Tue, 28 Jan 2020 18:53:08 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/adc/Makefile.objs | 1 -
hw/adc/meson.build | 1 +
hw/meson.build | 1 +
4 files changed, 2 insertions(+), 2 deletions(-)
delete mode 100644 hw/adc/Makefile.objs
create mode 100644 hw/adc/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index c69c3aa4c5..5823867997 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,7 +1,6 @@
ifeq ($(CONFIG_SOFTMMU), y)
devices-dirs-$(call lor,$(CONFIG_VIRTIO_9P),$(call
land,$(CONFIG_VIRTFS),$(CONFIG_XEN))) += 9pfs/
devices-dirs-y += acpi/
-devices-dirs-y += adc/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/adc/Makefile.objs b/hw/adc/Makefile.objs
deleted file mode 100644
index 3f6dfdedae..0000000000
--- a/hw/adc/Makefile.objs
+++ /dev/null
@@ -1 +0,0 @@
-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
diff --git a/hw/adc/meson.build b/hw/adc/meson.build
new file mode 100644
index 0000000000..2e7fea906e
--- /dev/null
+++ b/hw/adc/meson.build
@@ -0,0 +1 @@
+specific_ss.add(when: 'CONFIG_STM32F2XX_ADC', if_true:
files('stm32f2xx_adc.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 624335be90..ffa3f06dc0 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,3 +1,4 @@
+subdir('adc')
subdir('audio')
subdir('block')
subdir('char')
--
2.21.0
- [PATCH 098/142] meson: convert hw/ide, (continued)
- [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
- [PATCH 105/142] meson: convert hw/char, Paolo Bonzini, 2020/01/28
- [PATCH 106/142] meson: convert hw/block, Paolo Bonzini, 2020/01/28
- [PATCH 107/142] meson: convert hw/audio, Paolo Bonzini, 2020/01/28
- [PATCH 108/142] meson: convert hw/adc,
Paolo Bonzini <=
- [PATCH 109/142] meson: convert hw/acpi, Paolo Bonzini, 2020/01/28
- [PATCH 110/142] meson: convert hw/9pfs, Paolo Bonzini, 2020/01/28
- [PATCH 113/142] meson: accel, Paolo Bonzini, 2020/01/28
- [PATCH 111/142] meson: convert hw/arch*, Paolo Bonzini, 2020/01/28
- [PATCH 114/142] meson: linux-user, Paolo Bonzini, 2020/01/28
- [PATCH 115/142] meson: bsd-user, Paolo Bonzini, 2020/01/28
- [PATCH 112/142] meson: target, Paolo Bonzini, 2020/01/28
- [PATCH 116/142] meson: cpu-emu, Paolo Bonzini, 2020/01/28
- [PATCH 117/142] meson: softmmu, Paolo Bonzini, 2020/01/28
- [PATCH 118/142] meson: plugins, Paolo Bonzini, 2020/01/28