[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 099/142] meson: convert hw/i2c
From: |
Paolo Bonzini |
Subject: |
[PATCH 099/142] meson: convert hw/i2c |
Date: |
Tue, 28 Jan 2020 18:52:59 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/i2c/Makefile.objs | 13 -------------
hw/i2c/meson.build | 18 ++++++++++++++++++
hw/meson.build | 1 +
4 files changed, 19 insertions(+), 14 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 545d7440b5..95c065d18f 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 d7073a401f..0000000000
--- a/hw/i2c/Makefile.objs
+++ /dev/null
@@ -1,13 +0,0 @@
-common-obj-$(CONFIG_I2C) += core.o 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
-obj-$(CONFIG_OMAP) += omap_i2c.o
-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
diff --git a/hw/i2c/meson.build b/hw/i2c/meson.build
new file mode 100644
index 0000000000..43901e6f24
--- /dev/null
+++ b/hw/i2c/meson.build
@@ -0,0 +1,18 @@
+i2c_ss = ss.source_set()
+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_I2C', if_true: files('core.c', 'smbus_slave.c',
'smbus_master.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'))
+softmmu_ss.add_all(when: 'CONFIG_I2C', if_true: i2c_ss)
+
+specific_i2c_ss = ss.source_set()
+specific_i2c_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_i2c.c'))
+specific_i2c_ss.add(when: 'CONFIG_PPC4XX', if_true: files('ppc4xx_i2c.c'))
+specific_ss.add_all(when: 'CONFIG_I2C', if_true: specific_i2c_ss)
diff --git a/hw/meson.build b/hw/meson.build
index 4d7c31c652..983edc1d47 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('i2c')
subdir('ide')
subdir('input')
subdir('intc')
--
2.21.0
- [PATCH 089/142] meson: convert hw/nvram, (continued)
- [PATCH 089/142] meson: convert hw/nvram, Paolo Bonzini, 2020/01/28
- [PATCH 090/142] meson: convert hw/rdma, Paolo Bonzini, 2020/01/28
- [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 <=
- [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, 2020/01/28
- [PATCH 109/142] meson: convert hw/acpi, Paolo Bonzini, 2020/01/28