Browse Source

meson: convert hw/mem

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
pull/96/head
Marc-André Lureau 7 years ago
committed by Paolo Bonzini
parent
commit
97813b940d
  1. 1
      hw/Makefile.objs
  2. 1
      hw/mem/Kconfig
  3. 3
      hw/mem/Makefile.objs
  4. 6
      hw/mem/meson.build
  5. 1
      hw/meson.build

1
hw/Makefile.objs

@ -34,7 +34,6 @@ devices-dirs-y += usb/
devices-dirs-$(CONFIG_VFIO) += vfio/
devices-dirs-y += virtio/
devices-dirs-y += watchdog/
devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
endif
common-obj-y += $(devices-dirs-y)

1
hw/mem/Kconfig

@ -9,3 +9,4 @@ config NVDIMM
bool
default y
depends on (PC || PSERIES || ARM_VIRT)
select MEM_DEVICE

3
hw/mem/Makefile.objs

@ -1,3 +0,0 @@
common-obj-$(CONFIG_DIMM) += pc-dimm.o
common-obj-y += memory-device.o
common-obj-$(CONFIG_NVDIMM) += nvdimm.o

6
hw/mem/meson.build

@ -0,0 +1,6 @@
mem_ss = ss.source_set()
mem_ss.add(files('memory-device.c'))
mem_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c'))
mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c'))
softmmu_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss)

1
hw/meson.build

@ -1,4 +1,5 @@
subdir('core')
subdir('mem')
subdir('nubus')
subdir('semihosting')
subdir('smbios')

Loading…
Cancel
Save