| Message ID | 1596741379-12902-96-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/meson.build | 1 + > hw/sd/Makefile.objs | 12 ------------ > hw/sd/meson.build | 12 ++++++++++++ > 4 files changed, 13 insertions(+), 13 deletions(-) > delete mode 100644 hw/sd/Makefile.objs > create mode 100644 hw/sd/meson.build > > diff --git a/hw/Makefile.objs b/hw/Makefile.objs > index e50eb04..6f9c0b7 100644 > --- a/hw/Makefile.objs > +++ b/hw/Makefile.objs > @@ -25,7 +25,6 @@ devices-dirs-y += pci/ > devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ > devices-dirs-y += pcmcia/ > devices-dirs-$(CONFIG_SCSI) += scsi/ > -devices-dirs-y += sd/ > endif > > common-obj-y += $(devices-dirs-y) > diff --git a/hw/meson.build b/hw/meson.build > index 7564426..a73f4ae 100644 > --- a/hw/meson.build > +++ b/hw/meson.build > @@ -2,6 +2,7 @@ subdir('core') > subdir('mem') > subdir('nubus') > subdir('rtc') > +subdir('sd') > subdir('semihosting') > subdir('smbios') > subdir('ssi') > diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs > deleted file mode 100644 > index 0d1df17..0000000 > --- a/hw/sd/Makefile.objs > +++ /dev/null > @@ -1,12 +0,0 @@ > -common-obj-$(CONFIG_PL181) += pl181.o > -common-obj-$(CONFIG_SSI_SD) += ssi-sd.o > -common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o > -common-obj-$(CONFIG_SDHCI) += sdhci.o > -common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o > - > -common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-sdhost.o > -common-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o > -common-obj-$(CONFIG_OMAP) += omap_mmc.o > -common-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o > -common-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o > -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o > diff --git a/hw/sd/meson.build b/hw/sd/meson.build > new file mode 100644 > index 0000000..b43e59b > --- /dev/null > +++ b/hw/sd/meson.build > @@ -0,0 +1,12 @@ > +softmmu_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c')) > +softmmu_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-internal.c')) > +softmmu_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c')) > +softmmu_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c')) > +softmmu_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c')) > + > +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-memcard.c')) > +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c')) > +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c')) > +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c')) > +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c')) > +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c')) > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index e50eb04..6f9c0b7 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -25,7 +25,6 @@ devices-dirs-y += pci/ devices-dirs-$(CONFIG_PCI) += pci-bridge/ pci-host/ devices-dirs-y += pcmcia/ devices-dirs-$(CONFIG_SCSI) += scsi/ -devices-dirs-y += sd/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/meson.build b/hw/meson.build index 7564426..a73f4ae 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -2,6 +2,7 @@ subdir('core') subdir('mem') subdir('nubus') subdir('rtc') +subdir('sd') subdir('semihosting') subdir('smbios') subdir('ssi') diff --git a/hw/sd/Makefile.objs b/hw/sd/Makefile.objs deleted file mode 100644 index 0d1df17..0000000 --- a/hw/sd/Makefile.objs +++ /dev/null @@ -1,12 +0,0 @@ -common-obj-$(CONFIG_PL181) += pl181.o -common-obj-$(CONFIG_SSI_SD) += ssi-sd.o -common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o -common-obj-$(CONFIG_SDHCI) += sdhci.o -common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o - -common-obj-$(CONFIG_ALLWINNER_H3) += allwinner-sdhost.o -common-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o -common-obj-$(CONFIG_OMAP) += omap_mmc.o -common-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o -common-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o -common-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o diff --git a/hw/sd/meson.build b/hw/sd/meson.build new file mode 100644 index 0000000..b43e59b --- /dev/null +++ b/hw/sd/meson.build @@ -0,0 +1,12 @@ +softmmu_ss.add(when: 'CONFIG_PL181', if_true: files('pl181.c')) +softmmu_ss.add(when: 'CONFIG_SD', if_true: files('sd.c', 'core.c', 'sdmmc-internal.c')) +softmmu_ss.add(when: 'CONFIG_SDHCI', if_true: files('sdhci.c')) +softmmu_ss.add(when: 'CONFIG_SDHCI_PCI', if_true: files('sdhci-pci.c')) +softmmu_ss.add(when: 'CONFIG_SSI_SD', if_true: files('ssi-sd.c')) + +softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-memcard.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_mmc.c')) +softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_mmci.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_sdhost.c')) +softmmu_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_sdhci.c')) +softmmu_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-sdhost.c'))