Re: [RFC PATCH 08/13] blobs: Only install blobs if powerpc system targets are built

[David Gibson]

On Tue, Mar 23, 2021 at 04:51:27PM +0100, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Cc: David Gibson <david@gibson.dropbear.id.au>
> Cc: Greg Kurz <groug@kaod.org>
> Cc: qemu-ppc@nongnu.org
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Cc: Hervé Poussineau <hpoussin@reactos.org>
> Cc: Cédric Le Goater <clg@kaod.org>
> Cc: BALATON Zoltan <balaton@eik.bme.hu>
> ---
>  meson.build         |  2 ++
>  pc-bios/meson.build | 21 +++++++++++++--------
>  2 files changed, 15 insertions(+), 8 deletions(-)

Acked-by: David Gibson <david@gibson.dropbear.id.au>

> 
> diff --git a/meson.build b/meson.build
> index e3418815b04..6f5561c2212 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -97,6 +97,7 @@
>  install_blobs_arm = false
>  install_blobs_hppa = false
>  install_blobs_microblaze = false
> +install_blobs_ppc = false
>  if get_option('install_blobs')
>    foreach target : target_dirs
>      install_edk2_blobs = install_edk2_blobs or target in edk2_targets
> @@ -104,6 +105,7 @@
>      install_blobs_arm = install_blobs_hppa or target in ['arm-softmmu', 
> 'aarch64-softmmu']
>      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'))
>    endforeach
>  endif
>  
> diff --git a/pc-bios/meson.build b/pc-bios/meson.build
> index a6185feff58..73d02a57628 100644
> --- a/pc-bios/meson.build
> +++ b/pc-bios/meson.build
> @@ -43,7 +43,6 @@
>    'vgabios-ati.bin',
>    'openbios-sparc32',
>    'openbios-sparc64',
> -  'openbios-ppc',
>    'QEMU,tcx.bin',
>    'QEMU,cgthree.bin',
>    'pxe-e1000.rom',
> @@ -60,8 +59,6 @@
>    'efi-virtio.rom',
>    'efi-e1000e.rom',
>    'efi-vmxnet3.rom',
> -  'bamboo.dtb',
> -  'canyonlands.dtb',
>    'multiboot.bin',
>    'linuxboot.bin',
>    'linuxboot_dma.bin',
> @@ -69,11 +66,6 @@
>    'pvh.bin',
>    's390-ccw.img',
>    's390-netboot.img',
> -  'slof.bin',
> -  'skiboot.lid',
> -  'u-boot.e500',
> -  'u-boot-sam460-20100605.bin',
> -  'qemu_vga.ndrv',
>    'opensbi-riscv32-generic-fw_dynamic.bin',
>    'opensbi-riscv64-generic-fw_dynamic.bin',
>    'opensbi-riscv32-generic-fw_dynamic.elf',
> @@ -111,6 +103,19 @@
>    ))
>  endif
>  
> +if install_blobs_ppc
> +  blobs_ss.add(files(
> +    'bamboo.dtb',
> +    'canyonlands.dtb',
> +    'openbios-ppc',
> +    'qemu_vga.ndrv',
> +    'slof.bin',
> +    'skiboot.lid',
> +    'u-boot.e500',
> +    'u-boot-sam460-20100605.bin',
> +  ))
> +endif
> +
>  blobs_ss = blobs_ss.apply(config_host, strict: false)
>  
>  if get_option('install_blobs')

-- 
David Gibson                    | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist, thank you.  NOT _the_ _other_
                                | _way_ _around_!
http://www.ozlabs.org/~dgibson

signature.asc
Description: PGP signature