Message ID | 1596741379-12902-112-git-send-email-pbonzini@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Meson integration for 5.2 | expand |
On 8/6/20 9:15 PM, Paolo Bonzini wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > hw/Makefile.objs | 1 - > hw/i2c/Makefile.objs | 14 -------------- > hw/i2c/meson.build | 16 ++++++++++++++++ > hw/meson.build | 1 + > 4 files changed, 17 insertions(+), 15 deletions(-) > delete mode 100644 hw/i2c/Makefile.objs > create mode 100644 hw/i2c/meson.build Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On Thu, Aug 06, 2020 at 09:15:47PM +0200, Paolo Bonzini wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Corey Minyard <cminyard@mvista.com> > --- > hw/Makefile.objs | 1 - > hw/i2c/Makefile.objs | 14 -------------- > hw/i2c/meson.build | 16 ++++++++++++++++ > hw/meson.build | 1 + > 4 files changed, 17 insertions(+), 15 deletions(-) > delete mode 100644 hw/i2c/Makefile.objs > create mode 100644 hw/i2c/meson.build > > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index 02c5c0d..22eb804 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -10,7 +10,6 @@ devices-dirs-y += display/ > devices-dirs-y += dma/ > devices-dirs-y += gpio/ > devices-dirs-$(CONFIG_HYPERV) += hyperv/ > -devices-dirs-$(CONFIG_I2C) += i2c/ > endif > > common-obj-y += $(devices-dirs-y) > diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs > deleted file mode 100644 > index f2c61ea..0000000 > --- a/hw/i2c/Makefile.objs > +++ /dev/null > @@ -1,14 +0,0 @@ > -common-obj-$(CONFIG_I2C) += core.o > -common-obj-$(CONFIG_SMBUS) += smbus_slave.o smbus_master.o > -common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o > -common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o > -common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o > -common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o > -common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o > -common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o > -common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o > -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o > -common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o > -common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o > -common-obj-$(CONFIG_OMAP) += omap_i2c.o > -common-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o > diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build > new file mode 100644 > index 0000000..3a51153 > --- /dev/null > +++ b/hw/i2c/meson.build > @@ -0,0 +1,16 @@ > +i2c_ss = ss.source_set() > +i2c_ss.add(when: 'CONFIG_I2C', if_true: files('core.c')) > +i2c_ss.add(when: 'CONFIG_SMBUS', if_true: files('smbus_slave.c', 'smbus_master.c')) > +i2c_ss.add(when: 'CONFIG_ACPI_SMBUS', if_true: files('pm_smbus.c')) > +i2c_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('smbus_ich9.c')) > +i2c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i2c.c')) > +i2c_ss.add(when: 'CONFIG_BITBANG_I2C', if_true: files('bitbang_i2c.c')) > +i2c_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_i2c.c')) > +i2c_ss.add(when: 'CONFIG_IMX_I2C', if_true: files('imx_i2c.c')) > +i2c_ss.add(when: 'CONFIG_MPC_I2C', if_true: files('mpc_i2c.c')) > +i2c_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('microbit_i2c.c')) > +i2c_ss.add(when: 'CONFIG_SMBUS_EEPROM', if_true: files('smbus_eeprom.c')) > +i2c_ss.add(when: 'CONFIG_VERSATILE_I2C', if_true: files('versatile_i2c.c')) > +i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c')) > +i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c')) > +softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss) > diff --git a/hw/meson.build b/hw/meson.build > index 4d7c31c6..983edc1 100644 > --- a/hw/meson.build > +++ b/hw/meson.build > @@ -1,4 +1,5 @@ > subdir('core') > +subdir('i2c') > subdir('ide') > subdir('input') > subdir('intc') > -- > 1.8.3.1 > > >
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 02c5c0d..22eb804 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -10,7 +10,6 @@ devices-dirs-y += display/ devices-dirs-y += dma/ devices-dirs-y += gpio/ devices-dirs-$(CONFIG_HYPERV) += hyperv/ -devices-dirs-$(CONFIG_I2C) += i2c/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/i2c/Makefile.objs b/hw/i2c/Makefile.objs deleted file mode 100644 index f2c61ea..0000000 --- a/hw/i2c/Makefile.objs +++ /dev/null @@ -1,14 +0,0 @@ -common-obj-$(CONFIG_I2C) += core.o -common-obj-$(CONFIG_SMBUS) += smbus_slave.o smbus_master.o -common-obj-$(CONFIG_SMBUS_EEPROM) += smbus_eeprom.o -common-obj-$(CONFIG_VERSATILE_I2C) += versatile_i2c.o -common-obj-$(CONFIG_ACPI_X86_ICH) += smbus_ich9.o -common-obj-$(CONFIG_ACPI_SMBUS) += pm_smbus.o -common-obj-$(CONFIG_BITBANG_I2C) += bitbang_i2c.o -common-obj-$(CONFIG_EXYNOS4) += exynos4210_i2c.o -common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o -common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o -common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o -common-obj-$(CONFIG_OMAP) += omap_i2c.o -common-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build new file mode 100644 index 0000000..3a51153 --- /dev/null +++ b/hw/i2c/meson.build @@ -0,0 +1,16 @@ +i2c_ss = ss.source_set() +i2c_ss.add(when: 'CONFIG_I2C', if_true: files('core.c')) +i2c_ss.add(when: 'CONFIG_SMBUS', if_true: files('smbus_slave.c', 'smbus_master.c')) +i2c_ss.add(when: 'CONFIG_ACPI_SMBUS', if_true: files('pm_smbus.c')) +i2c_ss.add(when: 'CONFIG_ACPI_X86_ICH', if_true: files('smbus_ich9.c')) +i2c_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_i2c.c')) +i2c_ss.add(when: 'CONFIG_BITBANG_I2C', if_true: files('bitbang_i2c.c')) +i2c_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_i2c.c')) +i2c_ss.add(when: 'CONFIG_IMX_I2C', if_true: files('imx_i2c.c')) +i2c_ss.add(when: 'CONFIG_MPC_I2C', if_true: files('mpc_i2c.c')) +i2c_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('microbit_i2c.c')) +i2c_ss.add(when: 'CONFIG_SMBUS_EEPROM', if_true: files('smbus_eeprom.c')) +i2c_ss.add(when: 'CONFIG_VERSATILE_I2C', if_true: files('versatile_i2c.c')) +i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c')) +i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c')) +softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss) diff --git a/hw/meson.build b/hw/meson.build index 4d7c31c6..983edc1 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('i2c') subdir('ide') subdir('input') subdir('intc')