From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
qemu-riscv@nongnu.org,
"Sagar Karandikar" <sagark@eecs.berkeley.edu>,
"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Palmer Dabbelt" <palmer@dabbelt.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Alistair Francis" <Alistair.Francis@wdc.com>
Subject: [RFC PATCH 09/13] blobs: Only install firmware blobs if riscv system targets are built
Date: Tue, 23 Mar 2021 16:51:28 +0100 [thread overview]
Message-ID: <20210323155132.238193-10-f4bug@amsat.org> (raw)
In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Alistair Francis <Alistair.Francis@wdc.com>
Cc: Sagar Karandikar <sagark@eecs.berkeley.edu>
Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
Cc: qemu-riscv@nongnu.org
---
meson.build | 2 ++
pc-bios/meson.build | 13 +++++++++----
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index 6f5561c2212..4b614b30ed9 100644
--- a/meson.build
+++ b/meson.build
@@ -98,6 +98,7 @@
install_blobs_hppa = false
install_blobs_microblaze = false
install_blobs_ppc = false
+install_blobs_riscv = false
if get_option('install_blobs')
foreach target : target_dirs
install_edk2_blobs = install_edk2_blobs or target in edk2_targets
@@ -106,6 +107,7 @@
install_blobs_hppa = install_blobs_hppa or target in ['hppa-softmmu']
install_blobs_microblaze = install_blobs_microblaze or target in ['microblaze-softmmu', 'microblazeel-softmmu']
install_blobs_ppc = install_blobs_ppc or (target.startswith('ppc') and target.endswith('softmmu'))
+ install_blobs_riscv = install_blobs_riscv or target in ['riscv32-softmmu', 'riscv64-softmmu']
endforeach
endif
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 73d02a57628..504f03ec925 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -66,10 +66,6 @@
'pvh.bin',
's390-ccw.img',
's390-netboot.img',
- 'opensbi-riscv32-generic-fw_dynamic.bin',
- 'opensbi-riscv64-generic-fw_dynamic.bin',
- 'opensbi-riscv32-generic-fw_dynamic.elf',
- 'opensbi-riscv64-generic-fw_dynamic.elf',
))
if host_machine.system() == 'windows'
@@ -116,6 +112,15 @@
))
endif
+if install_blobs_riscv
+ blobs_ss.add(files(
+ 'opensbi-riscv32-generic-fw_dynamic.bin',
+ 'opensbi-riscv64-generic-fw_dynamic.bin',
+ 'opensbi-riscv32-generic-fw_dynamic.elf',
+ 'opensbi-riscv64-generic-fw_dynamic.elf',
+ ))
+endif
+
blobs_ss = blobs_ss.apply(config_host, strict: false)
if get_option('install_blobs')
--
2.26.2
next prev parent reply other threads:[~2021-03-23 16:42 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 15:51 [RFC PATCH 00/13] blobs: Only install required (system emulation) files Philippe Mathieu-Daudé
2021-03-23 15:51 ` [RFC PATCH 01/13] blobs: Use Meson source_set to store blob files Philippe Mathieu-Daudé
2021-03-23 16:22 ` Paolo Bonzini
2021-03-23 15:51 ` [RFC PATCH 02/13] blobs: Only install EDK2 license file if EDK2 blobs are installed Philippe Mathieu-Daudé
2021-03-23 16:15 ` Laszlo Ersek
2021-03-23 15:51 ` [RFC PATCH 03/13] blobs: Only install qemu-nsis.bmp on Windows host Philippe Mathieu-Daudé
2021-03-23 15:57 ` Stefan Weil
2021-03-23 15:51 ` [RFC PATCH 04/13] blobs: Only install PALcode blob if alpha system target is built Philippe Mathieu-Daudé
2021-03-23 16:29 ` Paolo Bonzini
2021-03-23 15:51 ` [RFC PATCH 05/13] blobs: Only install npcm7xx bootrom if ARM system targets are built Philippe Mathieu-Daudé
2021-03-23 16:29 ` Paolo Bonzini
2021-03-23 15:51 ` [RFC PATCH 06/13] blobs: Only install PA-RISC SeaBIOS if hppa system target is built Philippe Mathieu-Daudé
2021-03-23 23:09 ` Helge Deller
2021-03-23 15:51 ` [RFC PATCH 07/13] blobs: Only install DT blobs if microblaze system targets are built Philippe Mathieu-Daudé
2021-03-23 15:51 ` [RFC PATCH 08/13] blobs: Only install blobs if powerpc " Philippe Mathieu-Daudé
2021-03-23 23:09 ` David Gibson
2021-03-23 15:51 ` Philippe Mathieu-Daudé [this message]
2021-03-23 21:28 ` [RFC PATCH 09/13] blobs: Only install firmware blobs if riscv " Alistair Francis
2021-03-23 15:51 ` [RFC PATCH 10/13] blobs: Only install s390x firmwares if s390x system target is built Philippe Mathieu-Daudé
2021-03-24 5:52 ` Thomas Huth
2021-03-30 16:47 ` Cornelia Huck
2021-03-23 15:51 ` [RFC PATCH 11/13] blobs: Only install SPARC firmwares if sparc system targets are built Philippe Mathieu-Daudé
2021-03-23 15:51 ` [RFC PATCH 12/13] blobs: Only install x86 blobs if x86 " Philippe Mathieu-Daudé
2021-03-23 15:51 ` [RFC PATCH 13/13] meson: Only build ROM/BIOS when system emulation is built Philippe Mathieu-Daudé
2021-03-23 16:15 ` Thomas Huth
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210323155132.238193-10-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=Alistair.Francis@wdc.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=palmer@dabbelt.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sagark@eecs.berkeley.edu \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).