[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 095/147] meson: convert hw/ssi
From: |
Paolo Bonzini |
Subject: |
[PATCH 095/147] meson: convert hw/ssi |
Date: |
Mon, 10 Aug 2020 19:08:13 +0200 |
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/meson.build | 1 +
hw/ssi/Makefile.objs | 10 ----------
hw/ssi/meson.build | 9 +++++++++
4 files changed, 10 insertions(+), 11 deletions(-)
delete mode 100644 hw/ssi/Makefile.objs
create mode 100644 hw/ssi/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f60fd01..e50eb04 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -26,7 +26,6 @@ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/
devices-dirs-y += pcmcia/
devices-dirs-$(CONFIG_SCSI) += scsi/
devices-dirs-y += sd/
-devices-dirs-y += ssi/
endif
common-obj-y += $(devices-dirs-y)
diff --git a/hw/meson.build b/hw/meson.build
index 1fb1687..7564426 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -4,6 +4,7 @@ subdir('nubus')
subdir('rtc')
subdir('semihosting')
subdir('smbios')
+subdir('ssi')
subdir('timer')
subdir('tpm')
subdir('usb')
diff --git a/hw/ssi/Makefile.objs b/hw/ssi/Makefile.objs
deleted file mode 100644
index 07a85f1..0000000
--- a/hw/ssi/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-common-obj-$(CONFIG_PL022) += pl022.o
-common-obj-$(CONFIG_SSI) += ssi.o
-common-obj-$(CONFIG_XILINX_SPI) += xilinx_spi.o
-common-obj-$(CONFIG_XILINX_SPIPS) += xilinx_spips.o
-common-obj-$(CONFIG_ASPEED_SOC) += aspeed_smc.o
-common-obj-$(CONFIG_STM32F2XX_SPI) += stm32f2xx_spi.o
-common-obj-$(CONFIG_MSF2) += mss-spi.o
-
-common-obj-$(CONFIG_OMAP) += omap_spi.o
-common-obj-$(CONFIG_IMX) += imx_spi.o
diff --git a/hw/ssi/meson.build b/hw/ssi/meson.build
new file mode 100644
index 0000000..f1f5c28
--- /dev/null
+++ b/hw/ssi/meson.build
@@ -0,0 +1,9 @@
+softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_smc.c'))
+softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-spi.c'))
+softmmu_ss.add(when: 'CONFIG_PL022', if_true: files('pl022.c'))
+softmmu_ss.add(when: 'CONFIG_SSI', if_true: files('ssi.c'))
+softmmu_ss.add(when: 'CONFIG_STM32F2XX_SPI', if_true: files('stm32f2xx_spi.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX_SPI', if_true: files('xilinx_spi.c'))
+softmmu_ss.add(when: 'CONFIG_XILINX_SPIPS', if_true: files('xilinx_spips.c'))
+softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_spi.c'))
+softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_spi.c'))
--
1.8.3.1
- [PATCH 085/147] meson: convert hw/nubus, (continued)
- [PATCH 085/147] meson: convert hw/nubus, Paolo Bonzini, 2020/08/10
- [PATCH 083/147] meson: convert hw/core, Paolo Bonzini, 2020/08/10
- [PATCH 086/147] meson: convert hw/smbios, Paolo Bonzini, 2020/08/10
- [PATCH 087/147] meson: convert hw/mem, Paolo Bonzini, 2020/08/10
- [PATCH 088/147] meson: convert hw/watchdog, Paolo Bonzini, 2020/08/10
- [PATCH 089/147] meson: convert hw/virtio, Paolo Bonzini, 2020/08/10
- [PATCH 092/147] meson: convert hw/tpm, Paolo Bonzini, 2020/08/10
- [PATCH 090/147] meson: convert hw/vfio, Paolo Bonzini, 2020/08/10
- [PATCH 093/147] meson: convert hw/timer, Paolo Bonzini, 2020/08/10
- [PATCH 094/147] meson: convert hw/rtc, Paolo Bonzini, 2020/08/10
- [PATCH 095/147] meson: convert hw/ssi,
Paolo Bonzini <=
- [PATCH 096/147] meson: convert hw/sd, Paolo Bonzini, 2020/08/10
- [PATCH 097/147] meson: convert hw/scsi, Paolo Bonzini, 2020/08/10
- [PATCH 091/147] meson: convert hw/usb, Paolo Bonzini, 2020/08/10
- [PATCH 098/147] meson: convert hw/pcmcia, Paolo Bonzini, 2020/08/10
- [PATCH 099/147] meson: convert hw/pci-host, Paolo Bonzini, 2020/08/10
- [PATCH 100/147] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/08/10
- [PATCH 101/147] meson: convert hw/pci, Paolo Bonzini, 2020/08/10
- [PATCH 102/147] meson: convert hw/nvram, Paolo Bonzini, 2020/08/10
- [PATCH 104/147] meson: convert hw/net, Paolo Bonzini, 2020/08/10