[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 083/143] meson: convert hw/semihosting
From: |
Paolo Bonzini |
Subject: |
[PATCH 083/143] meson: convert hw/semihosting |
Date: |
Thu, 6 Aug 2020 21:15:19 +0200 |
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/semihosting/Makefile.objs | 2 --
hw/semihosting/meson.build | 4 ++++
4 files changed, 5 insertions(+), 3 deletions(-)
delete mode 100644 hw/semihosting/Makefile.objs
create mode 100644 hw/semihosting/meson.build
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index bdf8bdf..6a7ca0f 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -36,7 +36,6 @@ devices-dirs-y += virtio/
devices-dirs-y += watchdog/
devices-dirs-$(CONFIG_MEM_DEVICE) += mem/
devices-dirs-$(CONFIG_NUBUS) += nubus/
-devices-dirs-y += semihosting/
devices-dirs-y += smbios/
endif
diff --git a/hw/meson.build b/hw/meson.build
index fe7c466..66a2f6c 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -1,2 +1,3 @@
subdir('core')
+subdir('semihosting')
subdir('xen')
diff --git a/hw/semihosting/Makefile.objs b/hw/semihosting/Makefile.objs
deleted file mode 100644
index 4ad47c0..0000000
--- a/hw/semihosting/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-$(CONFIG_SEMIHOSTING) += config.o
-obj-$(CONFIG_SEMIHOSTING) += console.o
diff --git a/hw/semihosting/meson.build b/hw/semihosting/meson.build
new file mode 100644
index 0000000..f40ac57
--- /dev/null
+++ b/hw/semihosting/meson.build
@@ -0,0 +1,4 @@
+specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
+ 'config.c',
+ 'console.c',
+))
--
1.8.3.1
- [PATCH 074/143] meson: convert replay directory to Meson, (continued)
- [PATCH 074/143] meson: convert replay directory to Meson, Paolo Bonzini, 2020/08/06
- [PATCH 075/143] meson: convert migration directory to Meson, Paolo Bonzini, 2020/08/06
- [PATCH 076/143] meson: convert net directory to Meson, Paolo Bonzini, 2020/08/06
- [PATCH 077/143] meson: convert backends directory to Meson, Paolo Bonzini, 2020/08/06
- [PATCH 078/143] meson: convert fsdev/, Paolo Bonzini, 2020/08/06
- [PATCH 080/143] meson: convert qapi-specific to meson, Paolo Bonzini, 2020/08/06
- [PATCH 079/143] meson: convert disas directory to Meson, Paolo Bonzini, 2020/08/06
- [PATCH 081/143] meson: convert hw/xen, Paolo Bonzini, 2020/08/06
- [PATCH 082/143] meson: convert hw/core, Paolo Bonzini, 2020/08/06
- [PATCH 084/143] meson: convert hw/nubus, Paolo Bonzini, 2020/08/06
- [PATCH 083/143] meson: convert hw/semihosting,
Paolo Bonzini <=
- [PATCH 085/143] meson: convert hw/smbios, Paolo Bonzini, 2020/08/06
- [PATCH 087/143] meson: convert hw/watchdog, Paolo Bonzini, 2020/08/06
- [PATCH 086/143] meson: convert hw/mem, Paolo Bonzini, 2020/08/06
- [PATCH 088/143] meson: convert hw/virtio, Paolo Bonzini, 2020/08/06
- [PATCH 089/143] meson: convert hw/vfio, Paolo Bonzini, 2020/08/06
- [PATCH 091/143] meson: convert hw/tpm, Paolo Bonzini, 2020/08/06
- [PATCH 090/143] meson: convert hw/usb, Paolo Bonzini, 2020/08/06
- [PATCH 093/143] meson: convert hw/rtc, Paolo Bonzini, 2020/08/06
- [PATCH 092/143] meson: convert hw/timer, Paolo Bonzini, 2020/08/06
- [PATCH 094/143] meson: convert hw/ssi, Paolo Bonzini, 2020/08/06