[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 05/13] blobs: Only install npcm7xx bootrom if ARM system targ
From: |
Philippe Mathieu-Daudé |
Subject: |
[RFC PATCH 05/13] blobs: Only install npcm7xx bootrom if ARM system targets are built |
Date: |
Tue, 23 Mar 2021 16:51:24 +0100 |
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Havard Skinnemoen <hskinnemoen@google.com>
Cc: Tyrone Ting <kfting@nuvoton.com>
Cc: qemu-arm@nongnu.org
---
meson.build | 2 ++
pc-bios/meson.build | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index b5b8892fe7a..10c21ef52af 100644
--- a/meson.build
+++ b/meson.build
@@ -94,10 +94,12 @@
edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu',
'x86_64-softmmu' ]
install_edk2_blobs = false
install_blobs_alpha = false
+install_blobs_arm = false
if get_option('install_blobs')
foreach target : target_dirs
install_edk2_blobs = install_edk2_blobs or target in edk2_targets
install_blobs_alpha = install_blobs_alpha or target in ['alpha-softmmu']
+ install_blobs_arm = install_blobs_hppa or target in ['arm-softmmu',
'aarch64-softmmu']
endforeach
endif
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 29085912d7d..635485931b9 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -81,7 +81,6 @@
'opensbi-riscv64-generic-fw_dynamic.bin',
'opensbi-riscv32-generic-fw_dynamic.elf',
'opensbi-riscv64-generic-fw_dynamic.elf',
- 'npcm7xx_bootrom.bin',
))
if host_machine.system() == 'windows'
@@ -96,6 +95,12 @@
))
endif
+if install_blobs_arm
+ blobs_ss.add(files(
+ 'npcm7xx_bootrom.bin',
+ ))
+endif
+
blobs_ss = blobs_ss.apply(config_host, strict: false)
if get_option('install_blobs')
--
2.26.2
- [RFC PATCH 05/13] blobs: Only install npcm7xx bootrom if ARM system targets are built,
Philippe Mathieu-Daudé <=