[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 088/152] meson: convert hw/semihosting
From: |
Paolo Bonzini |
Subject: |
[PULL v8 088/152] meson: convert hw/semihosting |
Date: |
Fri, 21 Aug 2020 06:22:25 -0400 |
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 bdf8bdf256..6a7ca0fcfe 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 fe7c466460..66a2f6cddd 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 4ad47c05c0..0000000000
--- 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 0000000000..f40ac574c4
--- /dev/null
+++ b/hw/semihosting/meson.build
@@ -0,0 +1,4 @@
+specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files(
+ 'config.c',
+ 'console.c',
+))
--
2.26.2
- [PULL v8 086/152] meson: convert hw/xen, (continued)
- [PULL v8 086/152] meson: convert hw/xen, Paolo Bonzini, 2020/08/21
- [PULL v8 090/152] meson: convert hw/smbios, Paolo Bonzini, 2020/08/21
- [PULL v8 091/152] meson: convert hw/mem, Paolo Bonzini, 2020/08/21
- [PULL v8 093/152] meson: convert hw/virtio, Paolo Bonzini, 2020/08/21
- [PULL v8 096/152] meson: convert hw/tpm, Paolo Bonzini, 2020/08/21
- [PULL v8 098/152] meson: convert hw/rtc, Paolo Bonzini, 2020/08/21
- [PULL v8 094/152] meson: convert hw/vfio, Paolo Bonzini, 2020/08/21
- [PULL v8 097/152] meson: convert hw/timer, Paolo Bonzini, 2020/08/21
- [PULL v8 095/152] meson: convert hw/usb, Paolo Bonzini, 2020/08/21
- [PULL v8 100/152] meson: convert hw/sd, Paolo Bonzini, 2020/08/21
- [PULL v8 088/152] meson: convert hw/semihosting,
Paolo Bonzini <=
- [PULL v8 099/152] meson: convert hw/ssi, Paolo Bonzini, 2020/08/21
- [PULL v8 101/152] meson: convert hw/scsi, Paolo Bonzini, 2020/08/21
- [PULL v8 102/152] meson: convert hw/pcmcia, Paolo Bonzini, 2020/08/21
- [PULL v8 108/152] meson: convert hw/net, Paolo Bonzini, 2020/08/21
- [PULL v8 105/152] meson: convert hw/pci, Paolo Bonzini, 2020/08/21
- [PULL v8 107/152] meson: convert hw/rdma, Paolo Bonzini, 2020/08/21
- [PULL v8 104/152] meson: convert hw/pci-bridge, Paolo Bonzini, 2020/08/21
- [PULL v8 103/152] meson: convert hw/pci-host, Paolo Bonzini, 2020/08/21
- [PULL v8 109/152] meson: convert hw/misc, Paolo Bonzini, 2020/08/21
- [PULL v8 116/152] meson: convert hw/i2c, Paolo Bonzini, 2020/08/21