From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514700; cv=none; d=zohomail.com; s=zohoarc; b=Mm+BKQNjvpnFccTPDOMg6WNqX6QXClRDCI8clfbvjJixTvCY8o/hounliUAkuDz6ycNMg1hOAo64Hp2zPISaTkK+jKiXH8DEds+icALy+m4qeEMM2VDiWU185UAnahZvyoqBHHEN7uUi3LzcW9flSq/3bnWbe5lGAwVzi206I8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514700; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8TVtAnPRoKv1ZFmeJLpzKUIx1+VyTuxS/3GdmywQ+Cw=; b=ko9TH4scvxD/ybOVSPP8jbe/+bJhHHk5wyxbD+1+gnp+7QerTbdKhx2yGOZVKLw3ctNpCURRBZwxop8v6E/wkBaTo6chy7UgXFOgzo34OvtLuMB2Ir1uB8tFOwdcSgZtm6Cq5eDil00lKcbfRc1mM5IOLtP4B7njXbwejBDf6nE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1616514700528281.38323736110226; Tue, 23 Mar 2021 08:51:40 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id e18so21294499wrt.6 for ; Tue, 23 Mar 2021 08:51:39 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id d204sm3116514wmc.17.2021.03.23.08.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:51:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8TVtAnPRoKv1ZFmeJLpzKUIx1+VyTuxS/3GdmywQ+Cw=; b=IhhYR+BbNLsyups1003+HoBVeHOq93NcJqW3cfaXQ17ZEugbNMwVofr3Q1jGgWNRcK fyWM6jPz4PoKw6XeWnOKxAUXcMkAMYc6tCyDpTCm4JGs0i0ikWBG2RSQgPIvTgF925qF 9FiL3pdETIhrxuhE5NQQhNz6hUMKu8CSJN6AcX8yn3cHD3B2of7fhlqIdusSksWZ4F3K YCFsvwcm3kHwYEreBUcW2KFNSXRD0LthJHb/jbdWw1g0+LhzSjAfUMEryM1Oq9D8SA94 ZALs7tN5t+b0IM2ud9LGU7sAIJv0UEZb/y+cX47zTgwMA8+9qJm0W+thyoSc8/fPj9Dv bbtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8TVtAnPRoKv1ZFmeJLpzKUIx1+VyTuxS/3GdmywQ+Cw=; b=lvTrtCAIt0UzkjMGaZEDaSKCYQx/8mcq/lokwTL05StKQ5MMtMymbzlxqPXM5//NGF 28w045EMfA8qT7ewYqFZ3OufKsI15OdrTnFq2S+Je8/R7Jpy2GzlhHy701KnhR81dqjO wiI7DL5uUyC4FxVZPY8Ns1loHPqQYoTm4VuzEtfQDdzLML9m5BLpJqaC6JxMEskXbWBK o41r+M1iS4cLcfiyjgoM8OjQdY9a68f0leOWR0DjL/j+eLjVqlsJTPkXgKxz/zxqTojs 1UeJLLuHgonzUnGsSOY0P7ffvzKhRRnojGGHAj7dfm0Cp17qs8xq1CG7owkVza7IMM6n v43g== X-Gm-Message-State: AOAM530G0QsGATOtcj+iooBlD22VKR9ikx8vdRnDw4UYwfNSvtF+w92/ 6VlKv1kBc0DLyuPUmCIf6GE= X-Google-Smtp-Source: ABdhPJz+6k1eBK6DlIw/cKh3BgePk26p7+ytbSSXooSUyhhVc+wEM3p7OVp9NOHvTDgAzSTJrEmljg== X-Received: by 2002:a05:6000:1a8a:: with SMTP id f10mr4588010wry.232.1616514698814; Tue, 23 Mar 2021 08:51:38 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 01/13] blobs: Use Meson source_set to store blob files Date: Tue, 23 Mar 2021 16:51:20 +0100 Message-Id: <20210323155132.238193-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) As we want to conditionally install blob files, declare them using a source set. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- pc-bios/meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pc-bios/meson.build b/pc-bios/meson.build index f2b32598af7..1c4074bcb0d 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -1,3 +1,5 @@ +blobs_ss =3D ss.source_set() + if install_edk2_blobs fds =3D [ 'edk2-aarch64-code.fd', @@ -22,7 +24,7 @@ endforeach endif =20 -blobs =3D files( +blobs_ss.add(files( 'bios.bin', 'bios-256k.bin', 'bios-microvm.bin', @@ -81,10 +83,12 @@ 'opensbi-riscv32-generic-fw_dynamic.elf', 'opensbi-riscv64-generic-fw_dynamic.elf', 'npcm7xx_bootrom.bin', -) +)) + +blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') - install_data(blobs, install_dir: qemu_datadir) + install_data(blobs_ss.sources(), install_dir: qemu_datadir) endif =20 subdir('descriptors') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1616514707; cv=none; d=zohomail.com; s=zohoarc; b=YfQ8pfTvmkFs/HRN5MMl6MVibEhx999G1sQ4QgZxObCR2JEE3srLDrFySr3hZkeyAq+DL8UGpLpC0zjpLqsUxAU5NlfKoFvPUY23oUSh1iUvjqnYlAMB76vGQWPBGrjwVmWMZ6YawqesFjdyYOpyrVEkYHFe6VU7tWKGgOw+OHE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514707; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cVRTL1lCIDyPCEUdPlSzVJImpTKXfzymgaCzSitRndY=; b=RJbTcGi6Qu6NP1RDa4qKucnaHM+PE7S2tmi/YcIymY1a4EE8ofi9kCTZqxqY4dPxfnAc6qtqOj4pE3FlTnaoUN9AGAcNJx+ETaCJDIGEJ56eRt40xcPMv6nKrRKrNqwpsMbXf1GMZD0+DHXzYEI7ExGHUAbKuKLzwh47oemqjfA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 161651470722533.648065065809874; Tue, 23 Mar 2021 08:51:47 -0700 (PDT) Received: by mail-wm1-f45.google.com with SMTP id 12so11320424wmf.5 for ; Tue, 23 Mar 2021 08:51:45 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id u2sm3963897wmm.5.2021.03.23.08.51.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:51:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cVRTL1lCIDyPCEUdPlSzVJImpTKXfzymgaCzSitRndY=; b=OTV28Jkm/XIkks9iBOU+Jc5vjf6q1PrK7hdFHYFhy84v+6qBEof5uhQMArBEmjAA0L 01ani6SZp6Hvt3X7bYRR6iucaCFnn1f1JvXzKQMmSUAKa1N8Qv0z6pyRcvy3Pkv08R9R yCGtvu2EvoaO9jOstQqSmoEHd6TRoWkr8xm9WD2cEyxsFUvb4ZWmGlMQPaV9DVD4ebaT F62vGFzaFI2K3bIjRZnxudDt+VDOyfw6hpwP0zbFtegubXjboznKidpiaBJuxgCXHizU xHtL6FQMhanZQC1WAe/y8F1TInqH3QeNKzwA5FFvS3lc0/UlBoeKDNDJVHUU2MPiYtDI WvYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=cVRTL1lCIDyPCEUdPlSzVJImpTKXfzymgaCzSitRndY=; b=i6nLr/sYbytbV3bsSNSrx5p2Jks91Tgk+dqY6rSyDOLgUeRmTIaJLd30yuW7Y911hg QKknRLT3zLvw4aFZYyrXBEbtOFQYZnNeiFhOnD76OfvXX1pT/1hD+OLlHVxFoC8+Gt+d 6Nekq58T9cmNwjw3jRG2UhLfdNtK6i5l5Kp37qDnT77ObMFC5vSMYvXlA6PEoNvHkyDb 73pJrgFy8eS03qZz5A5HCLPV3D1D4/o1JLxFqGSkQVI2o1VSI+0Rfu2e0D+PJeN45lx+ 8iEmZJtdK4vPGSixhVU2AiNgdQfetH+DUNDgFwE/ui6Nq09zvm/P3oRnCGjbvusIG8Qk 0mDg== X-Gm-Message-State: AOAM530W2t1wwA1jxKc5tl2b4k1214mNieEdw/ZINmrzbx68SvqAE98a gYCcPZEUXnOVQni32SGVb7Y= X-Google-Smtp-Source: ABdhPJw+zzxeS3e4MyGh1cmSv+Xt1N/KvMaYs3R4HJaVkykMatk+Bgq2ed1ahlFfbjri+gTGxvm7IA== X-Received: by 2002:a1c:7e82:: with SMTP id z124mr4021903wmc.51.1616514703524; Tue, 23 Mar 2021 08:51:43 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laszlo Ersek , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 02/13] blobs: Only install EDK2 license file if EDK2 blobs are installed Date: Tue, 23 Mar 2021 16:51:21 +0100 Message-Id: <20210323155132.238193-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Laszlo Ersek --- Cc: Laszlo Ersek Cc: Philippe Mathieu-Daud=C3=A9 --- pc-bios/meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 1c4074bcb0d..d270d8516c9 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -22,6 +22,8 @@ install_dir: qemu_datadir, command: [ bzip2, '-dc', '@INPUT0@' ]) endforeach + + blobs_ss.add(files('edk2-licenses.txt')) endif =20 blobs_ss.add(files( @@ -76,7 +78,6 @@ 'u-boot.e500', 'u-boot-sam460-20100605.bin', 'qemu_vga.ndrv', - 'edk2-licenses.txt', 'hppa-firmware.img', 'opensbi-riscv32-generic-fw_dynamic.bin', 'opensbi-riscv64-generic-fw_dynamic.bin', --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514709; cv=none; d=zohomail.com; s=zohoarc; b=ddEZgpnDRDaMUdOI3/UOQIlFlKWpoiAiWQMmOyXFnCxMG97gsrbeg41/IgS6XsRppMqb0yxv3OR3soQGmE6X+QFPiyaKWCqy79ixXs30dzrqhhwT9fQjG3n+WYMIlk2ZEhOnH/gDN4771BjFvihgFPBbTIBMbmuPjancUP50n6U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514709; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kuIsTlDZ9YAx5U7A0Fz+JimisCcfGpcI7V+925HgeYw=; b=SF8fK+xlZ0nMt/YQkB/2dgHfDbnrEtkN4Fikq6Glzs9Lu2KtPasjz58wdzybSfwmKJm+mHFNfh5qIYfMPws7ts3Jfz5o8h2HwsiSBFaE+o2k43yHvy62mj0IRBXDpvJ3dnWSnxgZd9SwNj+ytODBVD7i6LwcFPZujz39NyXDLpE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1616514709952600.1786052220922; Tue, 23 Mar 2021 08:51:49 -0700 (PDT) Received: by mail-wm1-f51.google.com with SMTP id m20-20020a7bcb940000b029010cab7e5a9fso13273612wmi.3 for ; Tue, 23 Mar 2021 08:51:49 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id l8sm24467177wrx.83.2021.03.23.08.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kuIsTlDZ9YAx5U7A0Fz+JimisCcfGpcI7V+925HgeYw=; b=VjIl0pDIzxV8JI7on+Lcb2/mBacxaTgoKx/OxpG+p5wBFWLFcsugNzZJU3ckzhhpjN RR/fo5pjUkdft+iLTWKr72NWueuuYs5Cv03886nOZYzAG+TzT+nH7RQtI1jivv2cYWwb xstuLkOB4024WndedevfNfFg29EEphudJYFmjEOQX+pUzoxEoxgoZ0JDwo94z7hNK7NK HRGX5XQuf9WfVNZtSxQ9Xjv+SzaJyDMaS55KR5EOpro26rN+cxenTSWK4tKSiYkRCrez nO+w2ieyyBrBJ1Q8fEsi/3aFH1bU65S0YezjOycuQRFlopCdmYdVnmdjmaK9UINsMK+/ HEXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kuIsTlDZ9YAx5U7A0Fz+JimisCcfGpcI7V+925HgeYw=; b=NyKKiavQuJYY56qEEt5Fv3ObneZeDa8pjZDsv0eHDIR7w9rbw3xsqNCok03ZPfnSJN xJEjRoqNnNcrQLn8IYZxqODKtjmuqjMzsGM6dxDKyQhjl2ta+Ov09qmNk7GOZvzLx9jk 9ITXsWlsuEbYz059tZT6FD513CKKHOx8Ne9o1HKIeszZGAYZmsjDwtrEDMbfxugwm/UH 2sByJd5W6x9vI5Aaxf2xH6dgF1OoYchSqrylMgq9wLzpxLFYCRZUesgVkrkQZikSzjKO mn3pUE8DplJ2mujNNDuePg2hirw7evbBpAyrW+S8qXSk4ce7AQ3e5frDKuE7GQ5pxTfq 1Y5A== X-Gm-Message-State: AOAM5332i8rjFc3hsUB5gSLX6psLHJVr0vOCESbFiziqeLS4npysP7mD i7yzfrOd+gMp4FHg5n7XcdIuLht7WHiqzw== X-Google-Smtp-Source: ABdhPJwMFD0um+mXKiAxBXT0vSiIi4eJHyjO9PzdI0Ghieyl++/7WoXSYX1kZBXy09yckcH+kTus2Q== X-Received: by 2002:a05:600c:21d2:: with SMTP id x18mr3948209wmj.175.1616514708299; Tue, 23 Mar 2021 08:51:48 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Stefan Weil Subject: [RFC PATCH 03/13] blobs: Only install qemu-nsis.bmp on Windows host Date: Tue, 23 Mar 2021 16:51:22 +0100 Message-Id: <20210323155132.238193-4-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Stefan Weil --- Cc: Stefan Weil --- pc-bios/meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pc-bios/meson.build b/pc-bios/meson.build index d270d8516c9..007cf9d2afb 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -60,7 +60,6 @@ 'efi-virtio.rom', 'efi-e1000e.rom', 'efi-vmxnet3.rom', - 'qemu-nsis.bmp', 'bamboo.dtb', 'canyonlands.dtb', 'petalogix-s3adsp1800.dtb', @@ -86,6 +85,12 @@ 'npcm7xx_bootrom.bin', )) =20 +if host_machine.system() =3D=3D 'windows' + blobs_ss.add(files( + 'qemu-nsis.bmp', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514714; cv=none; d=zohomail.com; s=zohoarc; b=MF4XGcE6YVaLS6DAlItN64wWWzVUThNMtJ037a/F/CKonCECezNO9La1xdABIn6F6JwSBia7fn5mkxfjLi9WvQpfqH0cxgp/u7fkyxRiTipY949dsfvDs3s5/PXixzAoqmx1X6/E3Txim2I/FhnoBRW8rSYhxPx82l7ooNnCUvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514714; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xlrza0FHUl6O6MRZC048Y58WGtevu1iQWGx1G1PP0b8=; b=TGuSmi7zaYFbRTnlNbuifKQCi1ipVWOmZ4LnPI16d9rPqKjF2BCtRwA3qs1ZyShpA6ZGs6UZ++ZrCvAlWs2HDF/5VwdoKduurhTIm+lip8qWiy0OiGMrzZ9ySF463ETh0Q7k75wBMSwZj7yAxfLZPwkB3fOhCJgzwIZR+D47zSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1616514714702318.61099613215276; Tue, 23 Mar 2021 08:51:54 -0700 (PDT) Received: by mail-wm1-f47.google.com with SMTP id y124-20020a1c32820000b029010c93864955so13292601wmy.5 for ; Tue, 23 Mar 2021 08:51:54 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id c8sm25823800wrd.55.2021.03.23.08.51.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:51:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xlrza0FHUl6O6MRZC048Y58WGtevu1iQWGx1G1PP0b8=; b=M5s7BDesr9n/fcqdR8XA3FdkmrMwQjVPKsNdfrb8E4ymGYMZSFjzlI/ezMH8gxP020 EIYfYj6DC1NfN+596MwRtvLugJN9l3VA0q5biqrAFNRTj0qvsf/WIuXn0JauN5lJO7LK ZB1TCrGRJUyo3rWYR53CrwvRHO2288ZcJKAhxjcf4l1n5HWIC8hKJ2c3ptKDNNaeZBNj e1xlXA5hg0omBxpATMpuOoAoWH9i8ubO34eHYc2ufVe5LY86Fcmm5qx3W4R8XZVs0m7a aAddBQnoxL9NQRH6X0zkFLDPI9EilVhM+fHMqNQ9H3gcTn+qfg/scuusb/VwQzWzk/rH s8yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xlrza0FHUl6O6MRZC048Y58WGtevu1iQWGx1G1PP0b8=; b=FggVyPzyUDVt4HSULM0tN+v2vWo7UXc+pFh+s/0csw5S5dSvNbJ+saVvODDJDaPSOK no7zosFclRUu1uRe3+zM4oOXYOw09+TMNT1YdHTH8bLF9Hx581eiegIQB06dt1tBq8BR n09H1TwfOjCce1D4NydO/aC5YYCkhd1PPENERvnFLEnme6oliKpXNxJO1NPZ7TME2JIW 0F6odz8fdxtKJeYQUCVp9jDPKeAnm/25zImVH7aSxLExWmUAPnjXdhYmmtyKvohSKu2Y s2TrgXLfy0Vgk0YSAzG6JX9N2/NtvOjRHNZ5Oc/qq6PiAZD/u5XOE9aK8IJZgJ3fJlY4 8JFg== X-Gm-Message-State: AOAM533/v2aXdG2pC9lAVYGC09YaROkKzLCGdBeW7da/IrcE0l79+Qr+ v2+kGH5N5KF0r0Y6DXvUDzs9+RgwflOXKg== X-Google-Smtp-Source: ABdhPJyxM8GcniHnluGCTOVDXOjS0D0s+1+XCMwFk/e9NEQJreVqEBnHHDnb+O5hHlPys4qeRLsg8Q== X-Received: by 2002:a1c:68c5:: with SMTP id d188mr3854910wmc.119.1616514712931; Tue, 23 Mar 2021 08:51:52 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [RFC PATCH 04/13] blobs: Only install PALcode blob if alpha system target is built Date: Tue, 23 Mar 2021 16:51:23 +0100 Message-Id: <20210323155132.238193-5-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Richard Henderson --- meson.build | 2 ++ pc-bios/meson.build | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 5c85a15364d..b5b8892fe7a 100644 --- a/meson.build +++ b/meson.build @@ -93,9 +93,11 @@ =20 edk2_targets =3D [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_= 64-softmmu' ] install_edk2_blobs =3D false +install_blobs_alpha =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets + install_blobs_alpha =3D install_blobs_alpha or target in ['alpha-softm= mu'] endforeach endif =20 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 007cf9d2afb..29085912d7d 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -73,7 +73,6 @@ 's390-netboot.img', 'slof.bin', 'skiboot.lid', - 'palcode-clipper', 'u-boot.e500', 'u-boot-sam460-20100605.bin', 'qemu_vga.ndrv', @@ -91,6 +90,12 @@ )) endif =20 +if install_blobs_alpha + blobs_ss.add(files( + 'palcode-clipper', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514719; cv=none; d=zohomail.com; s=zohoarc; b=FhheeT98XcpvUSPlMCeFjakSP28SOhzlAZBwFEZEYO2igyRTl6RLWtKxq0lRFeHVxDdl72eDiD45uNj4MJZTVLgQZle/BlkkL0yEN8zPvmAtU27WuWCFkqRcZJENwlst8mddDPfNzCfp6nuezzBFpfCPOInYweLDnyr5UIk8Scw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514719; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wacrUPXby6VxBAOyWwd3GMdytvH/G6kApR/JrO/ejAY=; b=KGluao1hrjm7DpNqOS337yBvV+g5D9oXF74JZmn+dQ1ywVls6SEKhpxNYEkppwk+JwpRJh2vaOGi+ikzbdkYE3gmgw3QxxYsUpC/rgCqik9o76SumhUani7tu/CWSWHDnRb1TIN4oY6L3odntOn/CxhTgGPLeIE/YGBsGxe2vWQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1616514719642789.2060686185853; Tue, 23 Mar 2021 08:51:59 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id x13so21270892wrs.9 for ; Tue, 23 Mar 2021 08:51:59 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id g5sm24414743wrq.30.2021.03.23.08.51.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wacrUPXby6VxBAOyWwd3GMdytvH/G6kApR/JrO/ejAY=; b=OKV7cproh+phYnlnQ965o6n7nwQb2zQPwGVOb/6HfChkkqmjgWGuXV3GMN1V5RUn+s G2Aliv1nJAWcUD3vE+QzErO/+Ceo0om0AHkXLfdEcdoZFTy1Kti+giBkvemToLSiN3tW qUILq0FKh6HHOAZOfrepkViVJQ5gh1ekwbsBjvlh6kKRk828ru/i6y7NwfiFBhBaNosa 2WSZE8R60GaOX6ymjD9hPvaovjH4zUKt93AUQN9niY0Guw1Dqxft0hR09a2wsdNYBEXU oXpNC8N/LJFBKjP8gOflred30MfxxGVcWSY4kKrJor/orzmoczJ4FT09aNZRJblm4y7+ cSjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wacrUPXby6VxBAOyWwd3GMdytvH/G6kApR/JrO/ejAY=; b=dt38ltAP7Se9+ItuOYaM+Wfm5UZM6bgNmsKbPYN2vechTzv+PZQO8CaeutYWVG1PGH oYYwOqFT09PmJEQrooz7ubzwne6e34Ofn6uQPYocawh90lPUkNRl1k/p6Z75K8KcGB8j 8WwWe/xAOO6246pHgBDQVrluJtxHud3rjGrHZsgUG8cTNsLjgorDUT2PihaOVw8IOn64 b3mSZw5mJqm9aWoyZ+eOwDdFUIan/zjf2ZLbn/YkQCrniCaCpV0lgL454pe6vnQSWnfS ogIsH/Dq1PoQ45Z5UQRzslnWf6oCLDRyxAFwj9L2HtS/59CSO+Vs0Sd7EF3KylsYVnGt Unhg== X-Gm-Message-State: AOAM531SzFC9X7iRDkiXw3hjCV+9Rym9DKc2Eo2GMjU3EcG0YLA8VFa7 F9djTxZlzwDnyIlo93M7aeI= X-Google-Smtp-Source: ABdhPJy5y/PwDhZVyaWSa0rAe1kTg0luZ14xFYomnLq74Cin+V1haJeQXXFE3EdId88WaN4cGZmf7w== X-Received: by 2002:adf:8562:: with SMTP id 89mr4703432wrh.101.1616514717933; Tue, 23 Mar 2021 08:51:57 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Havard Skinnemoen , Tyrone Ting , qemu-arm@nongnu.org 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 Message-Id: <20210323155132.238193-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Havard Skinnemoen Cc: Tyrone Ting 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 =3D [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_= 64-softmmu' ] install_edk2_blobs =3D false install_blobs_alpha =3D false +install_blobs_arm =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets install_blobs_alpha =3D install_blobs_alpha or target in ['alpha-softm= mu'] + install_blobs_arm =3D install_blobs_hppa or target in ['arm-softmmu', = 'aarch64-softmmu'] endforeach endif =20 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', )) =20 if host_machine.system() =3D=3D 'windows' @@ -96,6 +95,12 @@ )) endif =20 +if install_blobs_arm + blobs_ss.add(files( + 'npcm7xx_bootrom.bin', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514724; cv=none; d=zohomail.com; s=zohoarc; b=Z3a8zh6JuaSc1uTOXJUjcqzMLJy5lXa2PTxugvDIlUKnEOJRlNlePK8cjIt+AQUaUWEJeFhEsGcaJZiTrpv5908R9e2G3BNqNWciNJpnxt+IsWOT/y6XAPUhCIpCaW4IP2J7KNKQwUJz0zuAu60ZBdTftnCPeZiLhIx/kOywU7U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514724; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Myy6NtGAPdIXwYr97fxHZnULk9+SaTCaWGOnhyLTAiI=; b=ixj9F1pAZSP8OwrDaRSNxgV3KErBEW03BepQEzZK3Ol75gCM5sIHG+uFOrJmM7wp1d6aeah6+gGC0pLrwnf07ZF0nPkkLPFrmfJc/DHkDCPTMsl45Gc1ntPeA+2rucwVyPw7AEtbv8qXQvuQdJ9+uTcJ8gzdqVQXX0k2421/LQc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1616514724444350.21100066452334; Tue, 23 Mar 2021 08:52:04 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id b9so21292318wrt.8 for ; Tue, 23 Mar 2021 08:52:03 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id q17sm23560292wrv.25.2021.03.23.08.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Myy6NtGAPdIXwYr97fxHZnULk9+SaTCaWGOnhyLTAiI=; b=GEUeuKfWsc7OFTnKfz1BMPr4wT7GJiPoO01dQv4uUFew60n3WWBmiNBp4pKqUZwC5L iV1LYLC9AOJ5Qf+dPq9AxxekTJi1UWpnP65ohn6nutK6lVCoCcl9ZAbTMzr96Fl2MG5r amV4VkhjgeHqaNLJSHjUaasOSDpx3VDy1vp2lurjWJHhkAsh54i6OWyK2ZuHmFfGGULQ +kXwk1Dc4QDH1ySot/qO0vDP6+6EQbWLDYwQIVCDouFMq4VqBoW09QIbeUJCWCMpf2jG bYIUc5oF+Ix7wnsDMIsDizDRurPZagW5JdVTwSiuEcCkNBsfMKeZgiz69HrEOB1I+oVY 7V9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Myy6NtGAPdIXwYr97fxHZnULk9+SaTCaWGOnhyLTAiI=; b=syRUQnlRn2QIz9L8PDRvl8Vt9kA2KMoLy+athekwb+P/LGH4BJhHYiSQUkc4PShIMG 5Sa8xk/PLBDL/MuzVVgzSviRDqjcdjrQM3GG7PF9wWDW/JcoswjhiXhYed35iV36zw7/ HnKOs/4ycs2EThm48H6pMXj7egQipN3b0xEJExFq5Q7inCln8cMZK1L2SGsbf37NkNq5 YmNvnLAoCNODK85MvAXfKxW+icT4w52HEwLJnHi1VQtrp4tbhsaChcpKrW7I3KoXAnKV fV/dBurUN2y5cIQ8/iO4mKV3U3Tf8aTsvU2EXRL1/vsLwsOY9U9DKPmk7Kjwirw4u/2O lWGA== X-Gm-Message-State: AOAM533gyYbNf5mjqDLwF7RThkltzF7jLDxFX2DolvFOYbJTYtOkkM8o UWnD4CnmZ9i0e4ssACILZWQ= X-Google-Smtp-Source: ABdhPJw80DzThkCCCOxSyax94GYNFjR4eqHagPBbW9/1LaVPpEDYNm4KN8X5gr6sGTc4X5l1M4ZmMA== X-Received: by 2002:a05:6000:191:: with SMTP id p17mr4775414wrx.154.1616514722601; Tue, 23 Mar 2021 08:52:02 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , Helge Deller Subject: [RFC PATCH 06/13] blobs: Only install PA-RISC SeaBIOS if hppa system target is built Date: Tue, 23 Mar 2021 16:51:25 +0100 Message-Id: <20210323155132.238193-7-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Helge Deller --- Cc: Richard Henderson Cc: Helge Deller --- 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 =3D false install_blobs_alpha =3D false install_blobs_arm =3D false +install_blobs_hppa =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets install_blobs_alpha =3D install_blobs_alpha or target in ['alpha-softm= mu'] install_blobs_arm =3D install_blobs_hppa or target in ['arm-softmmu', = 'aarch64-softmmu'] + install_blobs_hppa =3D install_blobs_hppa or target in ['hppa-softmmu'] endforeach endif =20 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 =20 +if install_blobs_hppa + blobs_ss.add(files( + 'hppa-firmware.img', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514730; cv=none; d=zohomail.com; s=zohoarc; b=D2YoJlrEudtzvaZS5ybhymwLuLfqVcVaNkCUZisATZndJY2Y920lYWABu2xh2wYEFIrSKj6Gmi22hOBrC39PNdhJKhzs4UdJgOxTfvmUm+d5gnfb8jsp8QkQ0cX8+KKDd9PH3PwKWY3xFM+lqA/bzFXdIza/36NhXB8EAvKBSDk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514730; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=f3IX+oBABgBBJ8mTl0P2HqszyCFPQo6B03YV79rC/Ew=; b=P0GT1C0waArFAPbPibQ90MQ4LmCmd/Ntno2DEr1NrqJq1BabQJxgjqP/J+pyb1/b9mfPv4h5r/eoRjtH2jLQl+JtvLLejr3scj26ncoaPxeUhKAKCedaMJKQ5MdSAyYjN8QsMA31rWU/xWlDGKIhWkkqvnj68J3+1sr3ZIQ8N0A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1616514730451956.1027709265232; Tue, 23 Mar 2021 08:52:10 -0700 (PDT) Received: by mail-wr1-f51.google.com with SMTP id j7so21304542wrd.1 for ; Tue, 23 Mar 2021 08:52:08 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id p16sm28402059wrt.54.2021.03.23.08.52.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f3IX+oBABgBBJ8mTl0P2HqszyCFPQo6B03YV79rC/Ew=; b=icUzzGertqWYPLF4W66cq4Z6N2ToMOze1yjvujttzLn3w/GxATWwKv2eR5on3dddQi Nt/LKRW75MOpBoAAMoV0age91NwdNIDYumzDwYIuMuTInbxrWeZmILZCDuIgGaXc3/wy kMqCW2c62yJcSz5W6LOvhK9+9sNjbm+eme1D5r3bzWuD0rmVW3Yz+RtCY0hHe/gpjDRk 86BMyIa4AM1OE24N3H5lBU5VAj1+YRjptBUN/hnetRoEl4n1z7PsWrA6u92k5kALIITG HrJe5c2OMUvAyTYzJpvnovQeK9zMxsR3RtBboDFE/EZ5CS+vyMWKwXyirW+9QI08dSGj Xbeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=f3IX+oBABgBBJ8mTl0P2HqszyCFPQo6B03YV79rC/Ew=; b=SYu6HPO1Iz39OBYa/3AsZJPOgIhh8+3Lm0nzov4BzkR04aQorlrTyCKWJaUV1GO9gp pEma+yk24ZKG5c6V5NHIz4QOslfAeapZx/NaOue2l7F2pls4Wi6MRp3XMeFSmT/W7ZR+ KI4Z9HrbO641r4Mefb03ALEFJ52NjrkRPIZDqw9+NK0HsfE8LqN/jei9LGjId1eN5PZ5 eUEsQTramleOAeApDLatjuyXc7HUpzdXGJ2RRPeQR6qFYRs0rZTxNcmDlLmjk6bbelfy HdK8I5nk9wXgrtUgAcK32872UL8t2e8b4/Skyah+YAvWLPu91r+NF48n8SuAm/kK2Bq/ LTfA== X-Gm-Message-State: AOAM532VV+nhk7+FydtZIRBFidnD5AYeavyi6bt4vj/QQ2KapaOef2nx TVJpWRnkS0+TI3tpMRFZL7IUmMyDoeTogg== X-Google-Smtp-Source: ABdhPJwL87VZN28mpG4DMw3vJmkCO557fI13g/NgbBU8yfRPdFu25VdjJEo2bvXbKcGhXX6v2leNcQ== X-Received: by 2002:adf:cf0b:: with SMTP id o11mr4850901wrj.310.1616514727405; Tue, 23 Mar 2021 08:52:07 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Edgar E . Iglesias" Subject: [RFC PATCH 07/13] blobs: Only install DT blobs if microblaze system targets are built Date: Tue, 23 Mar 2021 16:51:26 +0100 Message-Id: <20210323155132.238193-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Edgar E. Iglesias --- meson.build | 2 ++ pc-bios/meson.build | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index a7f3b60d08e..e3418815b04 100644 --- a/meson.build +++ b/meson.build @@ -96,12 +96,14 @@ install_blobs_alpha =3D false install_blobs_arm =3D false install_blobs_hppa =3D false +install_blobs_microblaze =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets install_blobs_alpha =3D install_blobs_alpha or target in ['alpha-softm= mu'] install_blobs_arm =3D install_blobs_hppa or target in ['arm-softmmu', = 'aarch64-softmmu'] install_blobs_hppa =3D install_blobs_hppa or target in ['hppa-softmmu'] + install_blobs_microblaze =3D install_blobs_microblaze or target in ['m= icroblaze-softmmu', 'microblazeel-softmmu'] endforeach endif =20 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index c494c334e26..a6185feff58 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -62,8 +62,6 @@ 'efi-vmxnet3.rom', 'bamboo.dtb', 'canyonlands.dtb', - 'petalogix-s3adsp1800.dtb', - 'petalogix-ml605.dtb', 'multiboot.bin', 'linuxboot.bin', 'linuxboot_dma.bin', @@ -106,6 +104,13 @@ )) endif =20 +if install_blobs_microblaze + blobs_ss.add(files( + 'petalogix-s3adsp1800.dtb', + 'petalogix-ml605.dtb', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514733; cv=none; d=zohomail.com; s=zohoarc; b=RHiDEe6aAdR3SO1W6K4vDdlTx8iXZOOlZQu9VCFPAxe0WK9L1tFsHK0OnoXXbmrm/Jcs20OLJhzgZt7yZE6AclUyRDywSVG/nNTVMTT6it9pE6SOxhJjf2tOTlN7jriP63sWI9ySbs9aBBcrUzoO9RS+ouIfyzw4Ul6DxqGcHig= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514733; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D9TdduAEXkE1G0/WUS2DqNMa3uvOw/RYi8/uMRmuc/s=; b=MTuIHzhKcPbvFpQ7Ymz0VtJRoBb9W8mFyc1P8Fc7bmLG3w2rCs8wcqKUTfRty7A5y8V2yOLEtvr2aInRQxOqCNOKr7JIRrwdFMicwjCQdHGKWCirJE1FR9BR95h8761Ao7/lSAzrFcrxqL+XLRjyrBpACw/DkYERVmXBUHAbeH4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1616514733990430.47803581307926; Tue, 23 Mar 2021 08:52:13 -0700 (PDT) Received: by mail-wr1-f54.google.com with SMTP id z2so21302015wrl.5 for ; Tue, 23 Mar 2021 08:52:13 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id j26sm24097164wrh.57.2021.03.23.08.52.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D9TdduAEXkE1G0/WUS2DqNMa3uvOw/RYi8/uMRmuc/s=; b=ki8f0pTW3PRnzW8YOF6b0eG9nXiIWw5JuXR55yZgsjHRQS9NKKj55rGGjoG3MTdOUV wKS+DEM67kq6jMvc0F/+n8w0xuaf8yGotQQfWyujQ78Ce0PqzE5XS7wQ+VUDO87qou3P jnlmZLpa35O5KzKYSAJ0vKMYm30oXfJrVvcqYUFZ1f6r4LZWwPSltqpd9nL7UKoQMbSZ Zn51L7WsyWliavmbIdZk/gY8rw2/hm1qpDz+PA0/Q28SJ5j+6jfmvgNZEnq0xH7K9Zxz zxFMcKq7ceqHELqxU2CyXue/EajO2yJ2SPEDxT/ZFu/lZEXp4KgCLX4g1RPCWRbJ+B6H 3y9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=D9TdduAEXkE1G0/WUS2DqNMa3uvOw/RYi8/uMRmuc/s=; b=m9ehn5fGOpoxMqfSs0HDb/1KLGuU7oxmghm7K9oGuWpVkxhYqL4GLijnELX2z9NE6W scorjiEOJgj53vIw4/A88aUqI2gupE4IAtL/vJfudSjMT+drEqW8eNzQi5javBMjYEyF ifJVK0TVfSPwSGQc2McSPSnQVpc2LrCc1HjILNAej7i+SnZ7Aen4fDHI+JclsmhldPO3 6WdCzkjEOg3BgWaN2hT460jfT/rT+TNsANp+Br7DvBjnSAWOKWmwSKRggRMcpR9mjn9w vzZPmJXX4hQ9a/Ag3lSQgqruiHBr6GzHqD8gyczd9cXhxF7n1oxcYgJKebbfPkzYDPFS INyw== X-Gm-Message-State: AOAM531F5cWiGYun+ayZ2nrBL4ZI/RctGYxLbC4NW+/HtSOKClluj0E4 pz9xVfiTaCXokAzwOM6Zkzc= X-Google-Smtp-Source: ABdhPJxwACULQ4O1SLfu6aiv7APorb+bwuO1jJfIanMXxxcBSoM5N+gkHFiQyThXRZmZ+26FQehBIw== X-Received: by 2002:a05:6000:1a8a:: with SMTP id f10mr4590294wry.232.1616514732292; Tue, 23 Mar 2021 08:52:12 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson , Greg Kurz , qemu-ppc@nongnu.org, Mark Cave-Ayland , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , BALATON Zoltan Subject: [RFC PATCH 08/13] blobs: Only install blobs if powerpc system targets are built Date: Tue, 23 Mar 2021 16:51:27 +0100 Message-Id: <20210323155132.238193-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: David Gibson Cc: Greg Kurz Cc: qemu-ppc@nongnu.org Cc: Mark Cave-Ayland Cc: Herv=C3=A9 Poussineau Cc: C=C3=A9dric Le Goater Cc: BALATON Zoltan --- meson.build | 2 ++ pc-bios/meson.build | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 8 deletions(-) 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 =3D false install_blobs_hppa =3D false install_blobs_microblaze =3D false +install_blobs_ppc =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets @@ -104,6 +105,7 @@ install_blobs_arm =3D install_blobs_hppa or target in ['arm-softmmu', = 'aarch64-softmmu'] install_blobs_hppa =3D install_blobs_hppa or target in ['hppa-softmmu'] install_blobs_microblaze =3D install_blobs_microblaze or target in ['m= icroblaze-softmmu', 'microblazeel-softmmu'] + install_blobs_ppc =3D install_blobs_ppc or (target.startswith('ppc') a= nd target.endswith('softmmu')) endforeach endif =20 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 =20 +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 =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514739; cv=none; d=zohomail.com; s=zohoarc; b=kSnF8uijhQBAdhRxIk7E9DO/meJFmXmZLZYV3JH/MfeHxq6NZ5HE9ungz5lsr3A3rRBLvcGPb6UwShZ8hhreQUzZhe879ETjJyuPStcOMnwszCME+b/7c+8JuBMhcyg2p0148b3qGa6zlJ0z6tjICJH8pHocIAKZoVaUt+oHU0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514739; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=bj7TZ4+mc83hcgkGuDGKQL6jYjIXiQVYGK6Ern5Gl+A=; b=fu/qjqw7YSlU43VGWH3q5W61UGJCSWX42/4YjuyustmbsCo5iyMS3xh+inlAdgdq76nCs3MugLCRVi7n26T51ygaOHna1R8ifM36UJJBFtDxQnfuQDY1WhhlOnZFprymZS1L1cOLIGpqqe2hd01t6a8mqFJKfQUMW1CjPByRWY4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1616514739020379.06541821994165; Tue, 23 Mar 2021 08:52:19 -0700 (PDT) Received: by mail-wr1-f45.google.com with SMTP id 61so21256909wrm.12 for ; Tue, 23 Mar 2021 08:52:18 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id g9sm24439663wrp.14.2021.03.23.08.52.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bj7TZ4+mc83hcgkGuDGKQL6jYjIXiQVYGK6Ern5Gl+A=; b=Bec1UKXjtrrB+BWybUtTAxlv3QiOPKqWtHrQj1p9Q/7rgFN119qOhG06LOkN0Alm2b Qmv2Uzt895vctULobOpXZTDuwoXMctV4PPMv2z8HvgGW/E3snlNaFPepwNfkylFfNsXa EQCO35iA0DEP8dSkhUxD44yioUvGr//Z95i8PHUptCb2u/OBb43UGaQV4SPYtRcd67bj 3LF6GhBKiC8BRIiaAUEeoAudGcSb6MstvCoUhApcTqCnwChiq3k0gJqOi4WMzXbr3HPA cZq7NKgP0Hamqq9NygFPWIhgnfRA7p28aAa/7i5dmQ+1GaGWZXpCAuHz7+TNr+j89MSj qapA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=bj7TZ4+mc83hcgkGuDGKQL6jYjIXiQVYGK6Ern5Gl+A=; b=L8jGwDpiX7vLgyvcF0e/JzCDvpq0mXh29KH4HMCNEkOLw6g2qJAHpUf3Eo9XBpAdI1 /aWXEENbrByfbgqfSzPXfWF0NFtkDuaYUrOv0eUYk2allE0MJ0aSRFCHKeYQ3yfil1eu YM0uzEMI4DKQgl/3KIhzQhnpk3cBZZcpv38rQNVU/GMEEC5wbHHcWGUZX870uytcjnAk peKHRwBYsQXbHnn/oHqKHXT9esKSLeTZSnMsEVoY1Fmqn9ywnu/aoelqlPMuZsz/ri0K UdWapHtvU0FJSYnCpOWycpLYw1/kNH5/1SZcnMnLA60xxrl6oNsNcDZhdtbIDrfz16PJ MXiQ== X-Gm-Message-State: AOAM530tpSfqVpKJ1Js2/BJ5/E+2sSO77bW3HeABkSmxnA0/hTQt4+zd wJ/g5jz2unf4dPaJzJjX4Hk= X-Google-Smtp-Source: ABdhPJyiydqH+lk+0C+/mg7jj/e7lWonsqnDL+KN0muVcKLZdpCFS0mVL02PP3Z+4arp2/amQR6IHg== X-Received: by 2002:adf:b313:: with SMTP id j19mr4626407wrd.188.1616514737216; Tue, 23 Mar 2021 08:52:17 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Palmer Dabbelt , Alistair Francis , Sagar Karandikar , Bastian Koppelmann , qemu-riscv@nongnu.org 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 Message-Id: <20210323155132.238193-10-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- Cc: Palmer Dabbelt Cc: Alistair Francis Cc: Sagar Karandikar Cc: Bastian Koppelmann 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 =3D false install_blobs_microblaze =3D false install_blobs_ppc =3D false +install_blobs_riscv =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets @@ -106,6 +107,7 @@ install_blobs_hppa =3D install_blobs_hppa or target in ['hppa-softmmu'] install_blobs_microblaze =3D install_blobs_microblaze or target in ['m= icroblaze-softmmu', 'microblazeel-softmmu'] install_blobs_ppc =3D install_blobs_ppc or (target.startswith('ppc') a= nd target.endswith('softmmu')) + install_blobs_riscv =3D install_blobs_riscv or target in ['riscv32-sof= tmmu', 'riscv64-softmmu'] endforeach endif =20 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', )) =20 if host_machine.system() =3D=3D 'windows' @@ -116,6 +112,15 @@ )) endif =20 +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 =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514743; cv=none; d=zohomail.com; s=zohoarc; b=FQ0gdfglJVllhGUj8tarDNy1Xql73N36/r62ATnWwyPxILKw1zF3qS9VSLZTGfwnuWeck9S7fggKDYGndc6lO+Yq6yVfp9trQchmJuU4anG6lVwEDJsnqAqh2teEtiNQ8g6koaB4MHz38ZpH1LpgnmGiwog3NAO/WQ6VnMdlFcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514743; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+DqJW1hILC/ty2QB5cQctASJtlCb2+R3sgj4EuGmuys=; b=e4KmmDhaZr03CiGut6rrH2ZGN1Nc0SohWOXV5AA87G5lG2X3ldIKjhAEUocXYbTGTcJ2rhzowR+9ytYHWSA4DI378PHg28ZuFiKlxJxoQk9z8RbhW1RfftkH9u3c1MgnkBi5klFx7Afa3hHvyKPuJMSFYdjBy8XA/hpcYKjDT50= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1616514743723426.1720541592699; Tue, 23 Mar 2021 08:52:23 -0700 (PDT) Received: by mail-wm1-f49.google.com with SMTP id j4-20020a05600c4104b029010c62bc1e20so11122396wmi.3 for ; Tue, 23 Mar 2021 08:52:23 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id c131sm3108481wma.37.2021.03.23.08.52.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+DqJW1hILC/ty2QB5cQctASJtlCb2+R3sgj4EuGmuys=; b=GJSEbMUHcK7MG1bOkO17yk6KMdusvFzkeFNWiEp6u+TCKUQoQrhc9vdCdLw6TJcKZu sqSHy76uPlx6PCStqBAPlfv+yay+T8WSseU/POu6j3/yi83CJpPyyBd5P6rSD5zPPE6x Izrv/0cJpGVP71l8hsVFA/o9KTSMeAbQqMu5/5vf8mzB8NO3sBwafzXk/72jqFpbll6T Y1KZ/pSYWcoZqM/sLnhxf+8PYVGA8XxV4h1wvJC+WQcwC2XOSQn77YsomE73V7BWUDiV /Cf9l9D4if/Tb6+qHJKWH8hEAUuWHqptn8lcnV8ZCzYL4eV4PNuK1VINYg4Cx+YgeX0Z H6ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+DqJW1hILC/ty2QB5cQctASJtlCb2+R3sgj4EuGmuys=; b=rmd7U1N9X9DisxuVzPOhTpxBsUzCpSsOcBAScJCk/dd7WokLpZJ7cKsnMdQt8rYX4P bYi1x+DVaTvPR775FwNaafbNKHW8ebuGDZ+YHNvRr66wCAoJssALEA1rXhMKzTNSyu65 GKO19XFfGIaIC26BVuv52utaeQBWuwKNOtDrPzSHwep/XTAeDKOgVOtLkmJi4s0Tj+Mj 6MAXP6lJrWX4H/K+uXOZscIpu4E8T7Wb4CzgkEmVM8df6BzQ3PLBbeiiNUtGcntZC9SS Y294fs42n+aVBQL5vsLrX+z6V/idZV+hSNtbTbRbnxvvkZlx1RGyszTvR9cZeUYiNbql dbKw== X-Gm-Message-State: AOAM530S3QWKe8Evq7hqvITO/vgh8moGEl4VP5ZLNrhKi8Z/xYYzZw71 bjSDTxY/BC4QW9OZ2W+jBDQ= X-Google-Smtp-Source: ABdhPJxQV4LtGiyYIBigA5Cb8mTzHIyoyQnjdxfUMhiJPQLhBx2aMWa4nwF3yrCztkKPhc/cJ7AEuw== X-Received: by 2002:a1c:bb0b:: with SMTP id l11mr4126287wmf.150.1616514742008; Tue, 23 Mar 2021 08:52:22 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cornelia Huck , qemu-s390x@nongnu.org Subject: [RFC PATCH 10/13] blobs: Only install s390x firmwares if s390x system target is built Date: Tue, 23 Mar 2021 16:51:29 +0100 Message-Id: <20210323155132.238193-11-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Cornelia Huck Reviewed-by: Thomas Huth --- Cc: Cornelia Huck Cc: Thomas Huth Cc: qemu-s390x@nongnu.org --- meson.build | 2 ++ pc-bios/meson.build | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 4b614b30ed9..fccda30ffc7 100644 --- a/meson.build +++ b/meson.build @@ -99,6 +99,7 @@ install_blobs_microblaze =3D false install_blobs_ppc =3D false install_blobs_riscv =3D false +install_blobs_s390x =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets @@ -108,6 +109,7 @@ install_blobs_microblaze =3D install_blobs_microblaze or target in ['m= icroblaze-softmmu', 'microblazeel-softmmu'] install_blobs_ppc =3D install_blobs_ppc or (target.startswith('ppc') a= nd target.endswith('softmmu')) install_blobs_riscv =3D install_blobs_riscv or target in ['riscv32-sof= tmmu', 'riscv64-softmmu'] + install_blobs_s390x =3D install_blobs_s390x or target in ['s390x-softm= mu'] endforeach endif =20 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 504f03ec925..27c0f316dee 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -64,8 +64,6 @@ 'linuxboot_dma.bin', 'kvmvapic.bin', 'pvh.bin', - 's390-ccw.img', - 's390-netboot.img', )) =20 if host_machine.system() =3D=3D 'windows' @@ -121,6 +119,13 @@ )) endif =20 +if install_blobs_s390x + blobs_ss.add(files( + 's390-ccw.img', + 's390-netboot.img', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) client-ip=209.85.221.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514748; cv=none; d=zohomail.com; s=zohoarc; b=edNMTjI52tjhLp7LJDnJ84g+UxvT+WA12C79QrcR4fyfbN0iMcaPyDokz22OabSNNAhB0c0A0Rg83q/nZZjpXEqtTseSWc2SusfzB/sqZ+c8RfQUn57lg1G+5LTaM35GSQiqhxqz805e3hug4DZY18qPfHhagKC6GMb3udtmG94= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514748; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6eMelu+S4QeZ4ihzo4OphSQWP1cKwxyXRVaJ5b/XIAo=; b=Izgu8Pw+PuA+eWU2Ou7442XGgsUPkHFyzTr6g6f5Kiuawv9HWCnOZOR2fWHLnWn9lFQaskthSONbPalJMkewFKhjB2VlYUvoxjQX87yCCua9MDtkULSfiN9VR3OqOVgaVVe9S/C2W+jSCHxarjOx3lpfURoS67AC5wo1I44UILc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mx.zohomail.com with SMTPS id 1616514748356354.99586139596977; Tue, 23 Mar 2021 08:52:28 -0700 (PDT) Received: by mail-wr1-f52.google.com with SMTP id j18so21282777wra.2 for ; Tue, 23 Mar 2021 08:52:27 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id s12sm2846389wmj.28.2021.03.23.08.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6eMelu+S4QeZ4ihzo4OphSQWP1cKwxyXRVaJ5b/XIAo=; b=hiZJV6Od8IwXEcgge0UpLKF49eM3OS8pZ4n2ANhK8XhjtDzJUP4unR6cI69ISACEnK Xn5NMh9GUXOPDIZk1DlVUAjXOsTcSU6mVgV1hflc73XcFArWtu5SZN628tJFvdGQXUy2 rr9IbFYPspQcTe8ZZYxnoL9g3S+p12dvy8g7yXBnffMkIvndoEB0JMmleRijWVJI+j95 cm6mWwBFkOwF0gohYdiY+N4xKhKxl+tzi4/gPeRtYNcDtkmmWH5nodZnTd9QyAWBZWem 6EkcillmRaksbXQOVfBMe+Ji3kbFN94BVaqk7xEKSOmlyp2vTEVRp3tHbTMq3HSyryh5 6nFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6eMelu+S4QeZ4ihzo4OphSQWP1cKwxyXRVaJ5b/XIAo=; b=uk4u+1e1wZVjNwW4QFQfJ7WU82RlWq6UL5d2yPplIfBdOK1gvt+F7JhsxWNw5ttFLp CApMe2CFkQLl4E8CeCSU5/sCC/VKQQzEvr7pLDxsdxz0e7fNGwezQA+8fstvO1m1WPgD aOH6UfW/ozQ0ySqQ3qtXfk/PvYy80ryV9lqLrKH8Eg1oUkp6IPck6JA2xr3aQRTvB6K3 jiYNs+mmuYdlnk+ffEfG1WMuHbXzTyjN/juaeIynBR6Kampnws+cOt12ay01wJjbu3HA K/FoS8BHy6wziYxarMDI/H5gzHV20sHF2L2tyKm1d2EOnP2aGAQF1PPnufXNEVytCoIB rz1g== X-Gm-Message-State: AOAM531PHN6Yqcyv61wWaICLXa80O5XeHRw6IbqOyp/Dl75acLvZeWhR etn86jE37EQDYq8IvpDKC/k= X-Google-Smtp-Source: ABdhPJw+9sOvyxasfpGjOlkDfiJD+A+kX2CRgBxKl/Bfk8j18bO+rh6vleDgqEWlMbqpE6ZyYnq60w== X-Received: by 2002:a05:6000:118c:: with SMTP id g12mr4674304wrx.353.1616514746693; Tue, 23 Mar 2021 08:52:26 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Mark Cave-Ayland , Artyom Tarasenko Subject: [RFC PATCH 11/13] blobs: Only install SPARC firmwares if sparc system targets are built Date: Tue, 23 Mar 2021 16:51:30 +0100 Message-Id: <20210323155132.238193-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Mark Cave-Ayland Cc: Artyom Tarasenko --- meson.build | 2 ++ pc-bios/meson.build | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index fccda30ffc7..addea8c39d7 100644 --- a/meson.build +++ b/meson.build @@ -100,6 +100,7 @@ install_blobs_ppc =3D false install_blobs_riscv =3D false install_blobs_s390x =3D false +install_blobs_sparc =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets @@ -110,6 +111,7 @@ install_blobs_ppc =3D install_blobs_ppc or (target.startswith('ppc') a= nd target.endswith('softmmu')) install_blobs_riscv =3D install_blobs_riscv or target in ['riscv32-sof= tmmu', 'riscv64-softmmu'] install_blobs_s390x =3D install_blobs_s390x or target in ['s390x-softm= mu'] + install_blobs_sparc =3D install_blobs_sparc or target in ['sparc-softm= mu', 'sparc64-softmmu'] endforeach endif =20 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 27c0f316dee..89efe4359e4 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -41,8 +41,6 @@ 'vgabios-ramfb.bin', 'vgabios-bochs-display.bin', 'vgabios-ati.bin', - 'openbios-sparc32', - 'openbios-sparc64', 'QEMU,tcx.bin', 'QEMU,cgthree.bin', 'pxe-e1000.rom', @@ -126,6 +124,13 @@ )) endif =20 +if install_blobs_sparc + blobs_ss.add(files( + 'openbios-sparc32', + 'openbios-sparc64', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1616514753; cv=none; d=zohomail.com; s=zohoarc; b=QJk1oaqA0eSCvgbFFxeViUQ9Q1Z0sSII9absOg23QEdGkf95tdcmob+FAhITHXByXxcKzyuLRtfJgmol9peZagXb4tGrsdcploEZBTPhilFFvtp1PUnmA++3ViTu9baBLr0Bwtj3OpY7OfZMmhUEskFYCIeV4zpehzNy2ldbI/4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514753; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p3ya2mpgZhcVqx9JPWm06XsQMNNZjAdoDpK4jTVD5vk=; b=PbsOhb1yjHlZmEssRBVATDp3BolGxeFoeb/wgVbRdL+OYGQpLn20OAwdyCpABiBoCQyRZqlEhx8fDvaX/P+9dL4qMEPiOo7DoV+2Iv4P0YbozGHDC5NxbfF+ydnL3JOoc7/OaukcG2wAXY1nbBUrqYm89bw1fpmksU9gIXu1RWw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 16165147532120.08384278702442316; Tue, 23 Mar 2021 08:52:33 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id j7so21306020wrd.1 for ; Tue, 23 Mar 2021 08:52:32 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id q15sm23900591wrr.58.2021.03.23.08.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=p3ya2mpgZhcVqx9JPWm06XsQMNNZjAdoDpK4jTVD5vk=; b=rhUUrbPH+U/TaeN9ncE8F+Gr8h0PPiDq4DiVNUz+MlAzrZn+cu4DB2DnLFlHi99Rev lKcyAxC49uifFWt9YglgBLqEZ7kELScYDCrubIcPCfvl2TbrS4GA3zWSqcMIe8059Iuc I5zYKNkiEpHBXkEo5EFOCyOr/k3xRXFQMZlontVMzKKChLIn//BHvGZeecYEDu74QYRs W2KpblOBoaMQqQrqhE8VUHvsmIgT7O+R573SNCw53EGyWeW598tYGbXBPAtsaKNjCGoN 9zyk7kCe63TgQr89PqS+xcXcq1mH87htrB9Rn5Eu7Jdb3txPwrx5thTrKAlLLi4knG/u oocg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=p3ya2mpgZhcVqx9JPWm06XsQMNNZjAdoDpK4jTVD5vk=; b=aGotYCMSuhhe6pcLogoVCbgwM0Ls9Pn/+kU2FsCZoz9aYunBqVsynzMyVwg8jgMxDs czfrnBRJq3fN0nYTfhPfg4q1bABrL6MqDdyuRP7hRUuJCL3KzcO0NOst9Xowik4Qxf1I C8uXI4/ZbNczFsbvAC6WMJ0b//MCrkYvd89asAJ8bmsFvjVMTPvxPEGSpm0JL4qg8ERX FdqoDlO8pz9xeoyo8VOosKWBMdjbnBjAWrTOz63zwRjMrD0QS5yGBFU9OzLqBS9xUPoC 4iAatFSqVWseeuhGIFW+wPAzJ98LKLjBY5KdyI+GZ9eJl115lzUgl+zmtd1oLL2r3Ht9 3P0w== X-Gm-Message-State: AOAM533TqQS3iICg/MiPtVevdEQby6x8ukpt2K4Jpd4mue8vAKXo4tw4 Gka+1yDqkIt4yH5hr57jo9z/QcKZTblQ2Q== X-Google-Smtp-Source: ABdhPJwo7VdX41AiAnvdLmOfh2xss/4KkF2bIxKuGgYqwZqwAHX+1HxxwSiq4hWu+86jtw6Cye1Aiw== X-Received: by 2002:a5d:42cb:: with SMTP id t11mr4640676wrr.280.1616514751554; Tue, 23 Mar 2021 08:52:31 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Eduardo Habkost , "Michael S . Tsirkin" , Marcel Apfelbaum Subject: [RFC PATCH 12/13] blobs: Only install x86 blobs if x86 system targets are built Date: Tue, 23 Mar 2021 16:51:31 +0100 Message-Id: <20210323155132.238193-13-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- Cc: Paolo Bonzini Cc: Eduardo Habkost Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum --- meson.build | 2 ++ pc-bios/meson.build | 23 ++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/meson.build b/meson.build index addea8c39d7..e484670c5b7 100644 --- a/meson.build +++ b/meson.build @@ -101,6 +101,7 @@ install_blobs_riscv =3D false install_blobs_s390x =3D false install_blobs_sparc =3D false +install_blobs_x86 =3D false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs =3D install_edk2_blobs or target in edk2_targets @@ -112,6 +113,7 @@ install_blobs_riscv =3D install_blobs_riscv or target in ['riscv32-sof= tmmu', 'riscv64-softmmu'] install_blobs_s390x =3D install_blobs_s390x or target in ['s390x-softm= mu'] install_blobs_sparc =3D install_blobs_sparc or target in ['sparc-softm= mu', 'sparc64-softmmu'] + install_blobs_x86 =3D install_blobs_x86 or target in ['i386-softmmu', = 'x86_64-softmmu'] endforeach endif =20 diff --git a/pc-bios/meson.build b/pc-bios/meson.build index 89efe4359e4..d21187545cf 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -27,10 +27,6 @@ endif =20 blobs_ss.add(files( - 'bios.bin', - 'bios-256k.bin', - 'bios-microvm.bin', - 'qboot.rom', 'sgabios.bin', 'vgabios.bin', 'vgabios-cirrus.bin', @@ -57,11 +53,6 @@ 'efi-virtio.rom', 'efi-e1000e.rom', 'efi-vmxnet3.rom', - 'multiboot.bin', - 'linuxboot.bin', - 'linuxboot_dma.bin', - 'kvmvapic.bin', - 'pvh.bin', )) =20 if host_machine.system() =3D=3D 'windows' @@ -131,6 +122,20 @@ )) endif =20 +if install_blobs_x86 + blobs_ss.add(files( + 'bios.bin', + 'bios-256k.bin', + 'bios-microvm.bin', + 'qboot.rom', + 'multiboot.bin', + 'linuxboot.bin', + 'linuxboot_dma.bin', + 'kvmvapic.bin', + 'pvh.bin', + )) +endif + blobs_ss =3D blobs_ss.apply(config_host, strict: false) =20 if get_option('install_blobs') --=20 2.26.2 From nobody Tue May 7 14:14:33 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) client-ip=209.85.221.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1616514757; cv=none; d=zohomail.com; s=zohoarc; b=llZ5I5YSfj7ZKnJr5O5Hw55JzzSbgw4EpgHFr2XSnHLdW8pJwoH5F3eDAHb+4pUtY+lHo0iUenjxln7JPu6Iz3ncyvdh1+c3sEH90po8AMh2i9UdEOwVno+oMEk5V9C6NeVCuEMSaG6lCCmDjUsjSqX/dYiOxF1//SkbEHqTzys= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1616514757; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2tqEBEhucvZcgWy/Gv5gUAbVkIKCsYndhLQthoTcvxQ=; b=S3RLJ8cMnJwsAmDrCqT6OjM2et3C3fnPOUubxJrtMXABQFnsiRCW3rD0oNdjG32luIeE6KjU7o+5ifWvmV8gSsk4hAyjhhEbKofLcQyXBcDmDayl2gRNUIi2Q0eQL2tYfAhTn73vnyHO5g/Z942st6TyRc7GTWTFQ0a7iZTAyKo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mx.zohomail.com with SMTPS id 1616514757814854.4909026380299; Tue, 23 Mar 2021 08:52:37 -0700 (PDT) Received: by mail-wr1-f44.google.com with SMTP id x13so21273202wrs.9 for ; Tue, 23 Mar 2021 08:52:37 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (17.red-88-21-201.staticip.rima-tde.net. [88.21.201.17]) by smtp.gmail.com with ESMTPSA id h25sm3368979wml.32.2021.03.23.08.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Mar 2021 08:52:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2tqEBEhucvZcgWy/Gv5gUAbVkIKCsYndhLQthoTcvxQ=; b=cKZ+lq+ADunFv7l+2A7y34777RxN18u0xW4rznOGl6JIP+ZGaDrrjPd4gEYOfBYevD br9Xafag0uMZdj9a+3jPOd5V7f5y2x5Z4BsRXNgy/LfeleyJwKU+YYIGOX2TPgjUmB8M ZYyZ6x8m2YTvjgNf07nG+RUTZ1oxm6RZoTRBrYUhgxwrcVzwdcRO23kgU/0Onqs61DZl KHB0QnHtBaDFynS4ZFsAqwowhpcQGfbunpEOGk7KwdZ7Lp5l/pwiFyC2xQpzCZrV618J fuxml/uG31FeUCIhrdkTp28Vej6Nr9vUv7v4UQl6p/JMmJXydfFFyAuwXlLqrBIIkwu8 UyIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2tqEBEhucvZcgWy/Gv5gUAbVkIKCsYndhLQthoTcvxQ=; b=pRy0g1YhceZlsk8dA5w6A+tqhTQoeZ5QT+V4M0rfLrwRGL6Pi50DN+0KUZHuBLHX1l bMonGwNYDhKJi8PnsEDx4WnbcEVJp/DXnh20Iz8PIj1+T2SsKFJWZ+js+BiLx/os8U5o qKjLCEs1wZ5XjCeFPheDnvP/Hh4eIDC25271D7Ppcck1P5AHwpuq7Mn7caeGOlHlDvAf vo/GDhpons5UYMd/b0O+9lyBKFrfCl5JcPSl7jaqdpJJuvLCSGmArAl+FOtJBbUDllRn XCT5Ob4M1CBSOecDqz2t5unX4vMv5LPmPGVugi7b0K8p21gyvadTdFLbXdVWCxm5oc8G C2+Q== X-Gm-Message-State: AOAM5307SRm2PaQdRf5a6KLtOKbHEXC+ACKhtiL8qijKlf0emQthAxGd wDHfVO0bnuhgnWY2rVl9v6k= X-Google-Smtp-Source: ABdhPJw1f142JLVfRiMoZ5HW0dvrlehLaxwmjAVKAT4ostlh8buEh8bM8bKQiDijWqefA2J0P/68tQ== X-Received: by 2002:a5d:628c:: with SMTP id k12mr4645497wru.316.1616514756151; Tue, 23 Mar 2021 08:52:36 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH 13/13] meson: Only build ROM/BIOS when system emulation is built Date: Tue, 23 Mar 2021 16:51:32 +0100 Message-Id: <20210323155132.238193-14-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210323155132.238193-1-f4bug@amsat.org> References: <20210323155132.238193-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) As it is pointless to build ROMs/BIOS for user-only emulation, restrict this directory to system-mode emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e484670c5b7..457a07047b1 100644 --- a/meson.build +++ b/meson.build @@ -2378,7 +2378,9 @@ =20 subdir('scripts') subdir('tools') -subdir('pc-bios') +if have_system + subdir('pc-bios') +endif subdir('docs') subdir('tests') if gtk.found() --=20 2.26.2