meson: convert hw/mem

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 73c49ddd3bd41295dd6159909831b862ff273217..df72b25a6474c5b57e3535f87a5ca47a407a787b 100644 (file)
--- a/hw/Makefile.objs
+++ b/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)

diff --git a/hw/mem/Kconfig b/hw/mem/Kconfig
index c27844900d3a5adc9dd06eb69e5c4ec30e1f6c32..a0ef2cf648e112233744ec859da1a4bb3cc6372d 100644 (file)
--- a/hw/mem/Kconfig
+++ b/hw/mem/Kconfig
@@ -9,3 +9,4 @@ config NVDIMM
     bool
     default y
     depends on (PC || PSERIES || ARM_VIRT)
+    select MEM_DEVICE

diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs
deleted file mode 100644 (file)
index 56345be..0000000
--- a/hw/mem/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-common-obj-$(CONFIG_DIMM) += pc-dimm.o
-common-obj-y += memory-device.o
-common-obj-$(CONFIG_NVDIMM) += nvdimm.o

diff --git a/hw/mem/meson.build b/hw/mem/meson.build
new file mode 100644 (file)
index 0000000..ba42462
--- /dev/null
+++ b/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)

diff --git a/hw/meson.build b/hw/meson.build
index dccc2d19a6b8cb40af124224a408d7dca58c06a0..542d675618a86b2f8fa4e297d8b61d2bcd0607db 100644 (file)
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
 subdir('core')
+subdir('mem')
 subdir('nubus')
 subdir('semihosting')
 subdir('smbios')