hw/char: riscv_htif: Drop {to, from}host_size in HTIFState

[mirror_qemu.git] / pc-bios / meson.build

diff --git a/pc-bios/meson.build b/pc-bios/meson.build
index a0d21be4321a8ba744d0af6696fcc3b93c512974..388e0db6e4035192bd2439ca2195b27efc3a8f71 100644 (file)
--- a/pc-bios/meson.build
+++ b/pc-bios/meson.build
@@ -1,7 +1,5 @@
-bzip2 = find_program('bzip2')
-
-install_blobs = 'INSTALL_BLOBS' in config_host
-if 'DECOMPRESS_EDK2_BLOBS' in config_host
+roms = []
+if unpack_edk2_blobs
   fds = [
     'edk2-aarch64-code.fd',
     'edk2-arm-code.fd',
@@ -14,17 +12,18 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host
   ]
 
   foreach f : fds
-    custom_target(f,
+    roms += custom_target(f,
+                  build_by_default: have_system,
                   output: f,
-                  input: '@0@.bz2'.format(f),
+                  input: files('@0@.bz2'.format(f)),
                   capture: true,
-                  install: install_blobs,
+                  install: get_option('install_blobs'),
                   install_dir: qemu_datadir,
                   command: [ bzip2, '-dc', '@INPUT0@' ])
   endforeach
 endif
 
-blobs = files(
+blobs = [
   'bios.bin',
   'bios-256k.bin',
   'bios-microvm.bin',
@@ -64,6 +63,7 @@ blobs = files(
   'petalogix-s3adsp1800.dtb',
   'petalogix-ml605.dtb',
   'multiboot.bin',
+  'multiboot_dma.bin',
   'linuxboot.bin',
   'linuxboot_dma.bin',
   'kvmvapic.bin',
@@ -80,13 +80,13 @@ blobs = files(
   'hppa-firmware.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',
   'npcm7xx_bootrom.bin',
-)
+  'vof.bin',
+  'vof-nvram.bin',
+]
 
-if install_blobs
-  install_data(blobs, install_dir: config_host['qemu_datadir'])
+if get_option('install_blobs')
+  install_data(blobs, install_dir: qemu_datadir)
 endif
 
 subdir('descriptors')