[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 067/132] meson: convert hw/mem
|
From: |
Paolo Bonzini |
|
Subject: |
[PATCH 067/132] meson: convert hw/mem |
|
Date: |
Thu, 12 Dec 2019 13:51:51 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
hw/Makefile.objs | 1 -
hw/mem/Kconfig | 1 +
hw/mem/Makefile.objs | 3 ---
hw/mem/meson.build | 3 +++
hw/meson.build | 1 +
5 files changed, 5 insertions(+), 4 deletions(-)
delete mode 100644 hw/mem/Makefile.objs
create mode 100644 hw/mem/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f5c2ab4..b91472b 100644
--- 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 620fd4c..9e6c6b8 100644
--- a/hw/mem/Kconfig
+++ b/hw/mem/Kconfig
@@ -9,3 +9,4 @@ config NVDIMM
bool
default y
depends on PC
+ select MEM_DEVICE
diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs
deleted file mode 100644
index 3e2f7c5..0000000
--- a/hw/mem/Makefile.objs
+++ /dev/null
@@ -1,3 +0,0 @@
-common-obj-$(CONFIG_DIMM) += pc-dimm.o
-common-obj-$(CONFIG_MEM_DEVICE) += 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
index 0000000..f9adc45
--- /dev/null
+++ b/hw/mem/meson.build
@@ -0,0 +1,3 @@
+common_ss.add(when: 'CONFIG_MEM_DEVICE', if_true: files('memory-device.c'))
+common_ss.add(when: 'CONFIG_DIMM', if_true: files('pc-dimm.c'))
+common_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c'))
diff --git a/hw/meson.build b/hw/meson.build
index 80da62d..d788be4 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,4 +1,5 @@
subdir('core')
+subdir('mem')
subdir('semihosting')
subdir('smbios')
subdir('xen')
--
1.8.3.1
- [PATCH 059/132] meson: convert backends directory to Meson, (continued)
- [PATCH 059/132] meson: convert backends directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 058/132] meson: convert net directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 060/132] meson: convert fsdev/, Paolo Bonzini, 2019/12/12
- [PATCH 061/132] meson: convert disas directory to Meson, Paolo Bonzini, 2019/12/12
- [PATCH 063/132] meson: convert hw/xen, Paolo Bonzini, 2019/12/12
- [PATCH 062/132] meson: convert qapi-specific to meson, Paolo Bonzini, 2019/12/12
- [PATCH 064/132] meson: convert hw/core, Paolo Bonzini, 2019/12/12
- [PATCH 065/132] meson: convert hw/semihosting, Paolo Bonzini, 2019/12/12
- [PATCH 066/132] meson: convert hw/smbios, Paolo Bonzini, 2019/12/12
- [PATCH 068/132] meson: convert hw/watchdog, Paolo Bonzini, 2019/12/12
- [PATCH 067/132] meson: convert hw/mem,
Paolo Bonzini <=
- [PATCH 069/132] meson: convert hw/virtio, Paolo Bonzini, 2019/12/12
- [PATCH 070/132] meson: convert hw/vfio, Paolo Bonzini, 2019/12/12
- [PATCH 072/132] meson: convert hw/tpm, Paolo Bonzini, 2019/12/12
- [PATCH 071/132] meson: convert hw/usb, Paolo Bonzini, 2019/12/12
- [PATCH 073/132] meson: convert hw/timer, Paolo Bonzini, 2019/12/12
- [PATCH 074/132] meson: convert hw/ssi, Paolo Bonzini, 2019/12/12
- [PATCH 075/132] meson: convert hw/sd, Paolo Bonzini, 2019/12/12
- [PATCH 076/132] meson: convert hw/scsi, Paolo Bonzini, 2019/12/12
- [PATCH 078/132] meson: convert hw/pci-host, Paolo Bonzini, 2019/12/12
- [PATCH 077/132] meson: convert hw/pcmcia, Paolo Bonzini, 2019/12/12