diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-08-17 11:21:13 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-08-21 06:30:31 -0400 |
| commit | cff3c5d2b4029f375b9ed077d99577b3d64e7e24 (patch) | |
| tree | 6e0bcc287f2f4ea927e5b5d3d679a7d12702a497 /hw | |
| parent | b4c8eece5735b5b30bc48f600745c587f8f1170a (diff) | |
| download | qemu-cff3c5d2b4029f375b9ed077d99577b3d64e7e24.zip qemu-cff3c5d2b4029f375b9ed077d99577b3d64e7e24.tar.gz qemu-cff3c5d2b4029f375b9ed077d99577b3d64e7e24.tar.bz2 | |
meson: convert hw/cpu
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/Makefile.objs | 1 | ||||
| -rw-r--r-- | hw/cpu/Makefile.objs | 5 | ||||
| -rw-r--r-- | hw/cpu/meson.build | 6 | ||||
| -rw-r--r-- | hw/meson.build | 1 |
4 files changed, 7 insertions, 6 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 6fce6a1..97ad302 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -5,7 +5,6 @@ devices-dirs-y += adc/ devices-dirs-y += audio/ devices-dirs-y += block/ devices-dirs-y += char/ -devices-dirs-y += cpu/ endif common-obj-y += $(devices-dirs-y) diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs deleted file mode 100644 index 8db9e8a..0000000 --- a/hw/cpu/Makefile.objs +++ /dev/null @@ -1,5 +0,0 @@ -obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o -obj-$(CONFIG_REALVIEW) += realview_mpcore.o -obj-$(CONFIG_A9MPCORE) += a9mpcore.o -obj-$(CONFIG_A15MPCORE) += a15mpcore.o -common-obj-y += core.o cluster.o diff --git a/hw/cpu/meson.build b/hw/cpu/meson.build new file mode 100644 index 0000000..9e52fee --- /dev/null +++ b/hw/cpu/meson.build @@ -0,0 +1,6 @@ +softmmu_ss.add(files('core.c', 'cluster.c')) + +specific_ss.add(when: 'CONFIG_ARM11MPCORE', if_true: files('arm11mpcore.c')) +specific_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview_mpcore.c')) +specific_ss.add(when: 'CONFIG_A9MPCORE', if_true: files('a9mpcore.c')) +specific_ss.add(when: 'CONFIG_A15MPCORE', if_true: files('a15mpcore.c')) diff --git a/hw/meson.build b/hw/meson.build index dacd26c..103da48 100644 --- a/hw/meson.build +++ b/hw/meson.build @@ -1,4 +1,5 @@ subdir('core') +subdir('cpu') subdir('display') subdir('dma') subdir('gpio') |