[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 09/13] blobs: Only install firmware blobs if riscv system tar
From: |
Philippe Mathieu-Daudé |
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 |
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
- Re: [RFC PATCH 02/13] blobs: Only install EDK2 license file if EDK2 blobs are installed, (continued)
- [RFC PATCH 03/13] blobs: Only install qemu-nsis.bmp on Windows host, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 04/13] blobs: Only install PALcode blob if alpha system target is built, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 05/13] blobs: Only install npcm7xx bootrom if ARM system targets are built, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 06/13] blobs: Only install PA-RISC SeaBIOS if hppa system target is built, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 07/13] blobs: Only install DT blobs if microblaze system targets are built, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 09/13] blobs: Only install firmware blobs if riscv system targets are built,
Philippe Mathieu-Daudé <=
- [RFC PATCH 10/13] blobs: Only install s390x firmwares if s390x system target is built, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 08/13] blobs: Only install blobs if powerpc system targets are built, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 11/13] blobs: Only install SPARC firmwares if sparc system targets are built, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 12/13] blobs: Only install x86 blobs if x86 system targets are built, Philippe Mathieu-Daudé, 2021/03/23
- [RFC PATCH 13/13] meson: Only build ROM/BIOS when system emulation is built, Philippe Mathieu-Daudé, 2021/03/23