On 8/10/20 7:08 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lur...@redhat.com>
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> 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 a2c2f6d..c04dfe5 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 3cfc261..0000000
> --- 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
> -
> -common-obj-$(CONFIG_OMAP) += omap_gpio.o
> -common-obj-$(CONFIG_IMX) += imx_gpio.o
> -common-obj-$(CONFIG_RASPI) += bcm2835_gpio.o
> -common-obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
> -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
> diff --git a/hw/gpio/meson.build b/hw/gpio/meson.build
> new file mode 100644
> index 0000000..6bcdfa6
> --- /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'))
> +
> +softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpio.c'))
> +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_gpio.c'))
> +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_gpio.c'))
> +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_gpio.c'))
> +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_gpio.c'))
> diff --git a/hw/meson.build b/hw/meson.build
> index f9e5adf..52577c3 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -1,4 +1,5 @@
> subdir('core')
> +subdir('gpio')
> subdir('hyperv')
> subdir('i2c')
> subdir('ide')
>
