[RFC PATCH 06/13] blobs: Only install PA-RISC SeaBIOS if hppa system target is built

Philippe Mathieu-Daudé posted 13 patches 4 years, 10 months ago
Maintainers: Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>
[RFC PATCH 06/13] blobs: Only install PA-RISC SeaBIOS if hppa system target is built
Posted by Philippe Mathieu-Daudé 4 years, 10 months ago
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Cc: Richard Henderson <richard.henderson@linaro.org>
Cc: Helge Deller <deller@gmx.de>
---
 meson.build         | 2 ++
 pc-bios/meson.build | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 10c21ef52af..a7f3b60d08e 100644
--- a/meson.build
+++ b/meson.build
@@ -95,11 +95,13 @@
 install_edk2_blobs = false
 install_blobs_alpha = false
 install_blobs_arm = false
+install_blobs_hppa = 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']
+    install_blobs_hppa = install_blobs_hppa or target in ['hppa-softmmu']
   endforeach
 endif
 
diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index 635485931b9..c494c334e26 100644
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -76,7 +76,6 @@
   'u-boot.e500',
   'u-boot-sam460-20100605.bin',
   'qemu_vga.ndrv',
-  'hppa-firmware.img',
   'opensbi-riscv32-generic-fw_dynamic.bin',
   'opensbi-riscv64-generic-fw_dynamic.bin',
   'opensbi-riscv32-generic-fw_dynamic.elf',
@@ -101,6 +100,12 @@
   ))
 endif
 
+if install_blobs_hppa
+  blobs_ss.add(files(
+    'hppa-firmware.img',
+  ))
+endif
+
 blobs_ss = blobs_ss.apply(config_host, strict: false)
 
 if get_option('install_blobs')
-- 
2.26.2

Re: [RFC PATCH 06/13] blobs: Only install PA-RISC SeaBIOS if hppa system target is built
Posted by Helge Deller 4 years, 10 months ago
On 3/23/21 4:51 PM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Cc: Richard Henderson <richard.henderson@linaro.org>
> Cc: Helge Deller <deller@gmx.de>

Acked-by: Helge Deller <deller@gmx.de>


> ---
>   meson.build         | 2 ++
>   pc-bios/meson.build | 7 ++++++-
>   2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/meson.build b/meson.build
> index 10c21ef52af..a7f3b60d08e 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -95,11 +95,13 @@
>   install_edk2_blobs = false
>   install_blobs_alpha = false
>   install_blobs_arm = false
> +install_blobs_hppa = 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']
> +    install_blobs_hppa = install_blobs_hppa or target in ['hppa-softmmu']
>     endforeach
>   endif
>
> diff --git a/pc-bios/meson.build b/pc-bios/meson.build
> index 635485931b9..c494c334e26 100644
> --- a/pc-bios/meson.build
> +++ b/pc-bios/meson.build
> @@ -76,7 +76,6 @@
>     'u-boot.e500',
>     'u-boot-sam460-20100605.bin',
>     'qemu_vga.ndrv',
> -  'hppa-firmware.img',
>     'opensbi-riscv32-generic-fw_dynamic.bin',
>     'opensbi-riscv64-generic-fw_dynamic.bin',
>     'opensbi-riscv32-generic-fw_dynamic.elf',
> @@ -101,6 +100,12 @@
>     ))
>   endif
>
> +if install_blobs_hppa
> +  blobs_ss.add(files(
> +    'hppa-firmware.img',
> +  ))
> +endif
> +
>   blobs_ss = blobs_ss.apply(config_host, strict: false)
>
>   if get_option('install_blobs')
>