[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 093/132] meson: convert hw/gpio
From: |
Paolo Bonzini |
Subject: |
[PATCH 093/132] meson: convert hw/gpio |
Date: |
Thu, 12 Dec 2019 13:52:17 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/gpio/Makefile.objs | 11 -----------
hw/gpio/meson.build | 11 +++++++++++
hw/meson.build | 1 +
4 files changed, 12 insertions(+), 12 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 2ca159e..084bfc6 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -9,7 +9,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 e5da0cb..0000000
--- a/hw/gpio/Makefile.objs
+++ /dev/null
@@ -1,11 +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
diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
new file mode 100644
index 0000000..1d24a2d
--- /dev/null
+++ b/hw/gpio/meson.build
@@ -0,0 +1,11 @@
+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'))
diff --git a/hw/meson.build b/hw/meson.build
index bfd4d59..a61aeaf 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('gpio')
subdir('hyperv')
subdir('i2c')
subdir('ide')
--
1.8.3.1
- [PATCH 083/132] meson: convert hw/net, (continued)
- [PATCH 083/132] meson: convert hw/net, Paolo Bonzini, 2019/12/12
- [PATCH 085/132] meson: convert hw/isa, Paolo Bonzini, 2019/12/12
- [PATCH 084/132] meson: convert hw/misc, Paolo Bonzini, 2019/12/12
- [PATCH 086/132] meson: convert hw/ipmi, Paolo Bonzini, 2019/12/12
- [PATCH 087/132] meson: convert hw/ipack, Paolo Bonzini, 2019/12/12
- [PATCH 088/132] meson: convert hw/intc, Paolo Bonzini, 2019/12/12
- [PATCH 089/132] meson: convert hw/input, Paolo Bonzini, 2019/12/12
- [PATCH 090/132] meson: convert hw/ide, Paolo Bonzini, 2019/12/12
- [PATCH 092/132] meson: convert hw/hyperv, Paolo Bonzini, 2019/12/12
- [PATCH 091/132] meson: convert hw/i2c, Paolo Bonzini, 2019/12/12
- [PATCH 093/132] meson: convert hw/gpio,
Paolo Bonzini <=
- Re: [RFC PATCH v3 000/132] Proof of concept for Meson integration, Markus Armbruster, 2019/12/19
- [PATCH 092/132] meson: convert hw/hyperv, Paolo Bonzini, 2019/12/19
- [PATCH 094/132] meson: convert hw/dma, Paolo Bonzini, 2019/12/19
- [PATCH 093/132] meson: convert hw/gpio, Paolo Bonzini, 2019/12/19
- [PATCH 095/132] meson: convert hw/display, Paolo Bonzini, 2019/12/19
- [PATCH 096/132] meson: convert hw/cpu, Paolo Bonzini, 2019/12/19
- [PATCH 098/132] meson: convert hw/bt, Paolo Bonzini, 2019/12/19
- [PATCH 097/132] meson: convert hw/char, Paolo Bonzini, 2019/12/19
- [PATCH 099/132] meson: convert hw/block, Paolo Bonzini, 2019/12/19