[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 101/142] meson: convert hw/gpio
From: |
Paolo Bonzini |
Subject: |
[PATCH 101/142] meson: convert hw/gpio |
Date: |
Tue, 28 Jan 2020 18:53:01 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/gpio/Makefile.objs | 12 ------------
hw/gpio/meson.build | 12 ++++++++++++
hw/meson.build | 1 +
4 files changed, 13 insertions(+), 13 deletions(-)
delete mode 100644 hw/gpio/Makefile.objs
create mode 100644 hw/gpio/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index c9999a846b..d9b7d6b912 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -8,7 +8,6 @@ devices-dirs-y += char/
devices-dirs-y += cpu/
devices-dirs-y += display/
devices-dirs-y += dma/
-devices-dirs-y += gpio/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/gpio/Makefile.objs b/hw/gpio/Makefile.objs
deleted file mode 100644
index d305b3b24b..0000000000
--- a/hw/gpio/Makefile.objs
+++ /dev/null
@@ -1,12 +0,0 @@
-common-obj-$(CONFIG_MAX7310) += max7310.o
-common-obj-$(CONFIG_PL061) += pl061.o
-common-obj-$(CONFIG_PUV3) += puv3_gpio.o
-common-obj-$(CONFIG_ZAURUS) += zaurus.o
-common-obj-$(CONFIG_E500) += mpc8xxx.o
-common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o
-
-obj-$(CONFIG_OMAP) += omap_gpio.o
-obj-$(CONFIG_IMX) += imx_gpio.o
-obj-$(CONFIG_RASPI) += bcm2835_gpio.o
-obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
-obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
new file mode 100644
index 0000000000..5fc34b970c
--- /dev/null
+++ b/hw/gpio/meson.build
@@ -0,0 +1,12 @@
+softmmu_ss.add(when: 'CONFIG_E500', if_true: files('mpc8xxx.c'))
+softmmu_ss.add(when: 'CONFIG_GPIO_KEY', if_true: files('gpio_key.c'))
+softmmu_ss.add(when: 'CONFIG_MAX7310', if_true: files('max7310.c'))
+softmmu_ss.add(when: 'CONFIG_PL061', if_true: files('pl061.c'))
+softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_gpio.c'))
+softmmu_ss.add(when: 'CONFIG_ZAURUS', if_true: files('zaurus.c'))
+
+specific_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
+specific_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c'))
+specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
+specific_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
+specific_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
diff --git a/hw/meson.build b/hw/meson.build
index f9e5adfb48..52577c3205 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('gpio')
subdir('hyperv')
subdir('i2c')
subdir('ide')
--
2.21.0
- [PATCH 091/142] meson: convert hw/net, (continued)
- [PATCH 091/142] meson: convert hw/net, Paolo Bonzini, 2020/01/28
- [PATCH 092/142] meson: convert hw/misc, Paolo Bonzini, 2020/01/28
- [PATCH 093/142] meson: convert hw/isa, Paolo Bonzini, 2020/01/28
- [PATCH 094/142] meson: convert hw/ipmi, Paolo Bonzini, 2020/01/28
- [PATCH 095/142] meson: convert hw/ipack, Paolo Bonzini, 2020/01/28
- [PATCH 096/142] meson: convert hw/intc, Paolo Bonzini, 2020/01/28
- [PATCH 097/142] meson: convert hw/input, Paolo Bonzini, 2020/01/28
- [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 <=
- [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, 2020/01/28
- [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