From patchwork Tue Mar 23 15:51:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158765 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CBEF2C433C1 for ; Tue, 23 Mar 2021 16:31:21 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 70D1D619BD for ; Tue, 23 Mar 2021 16:31:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 70D1D619BD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:55294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOjw8-0001RI-E9 for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:31:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjJu-00054x-NU for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:51:50 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:43838) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjJl-0003QF-9H for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:51:45 -0400 Received: by mail-wr1-x42e.google.com with SMTP id e9so21284641wrw.10 for ; Tue, 23 Mar 2021 08:51:40 -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=UrECwK/NgU7iictJ6mlobYRImsrhns43cO0ChPum15d91stEqdCpFPFBiCUuCIa9L+ iFxJXS0bO9AVenIJBGP9VrXEJY/WHhd4PsXV3B2/RAG2VJLtUG0R9bHJIWowLpPqomi+ koatAQqSuBVYMT+gLjxRSOfkaGGGRlCcIjZXtHkYdLXC8VXsfEnSeMyRJnZneQgk7bFt 3shcF9KLNouCJ3QSls7U2in1L6dY9ivDlP8xEk5PDtE/F4QDRoUffJHCHEY97ywsrP+G O4y6PSHg5OqcTOReNeucHbXI/ZuBFxrq8t5x6sSO2yMTRdaBmy3dRyL04tcan7woyGre HlXA== X-Gm-Message-State: AOAM5324LNlkbznHuefzxTfCPHjtmg8teKHtW9PQGQ95JRzPZU/ijyHC Sv28cDn5KsrSkmGyZIyUsb3A4ZNMVdj7Qw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As we want to conditionally install blob files, declare them using a source set. Signed-off-by: Philippe Mathieu-Daudé --- 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 = ss.source_set() + if install_edk2_blobs fds = [ 'edk2-aarch64-code.fd', @@ -22,7 +24,7 @@ endforeach endif -blobs = 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 = blobs_ss.apply(config_host, strict: false) if get_option('install_blobs') - install_data(blobs, install_dir: qemu_datadir) + install_data(blobs_ss.sources(), install_dir: qemu_datadir) endif subdir('descriptors') From patchwork Tue Mar 23 15:51:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158773 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88B66C433DB for ; Tue, 23 Mar 2021 16:34:54 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 12EF86199F for ; Tue, 23 Mar 2021 16:34:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 12EF86199F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOjzZ-0005jv-1N for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:34:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjJz-0005G8-55 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:51:55 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:41868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjJq-0003Rv-Ko for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:51:54 -0400 Received: by mail-wm1-x32e.google.com with SMTP id t5-20020a1c77050000b029010e62cea9deso11144855wmi.0 for ; Tue, 23 Mar 2021 08:51:44 -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=c27n6R3qSZtd/UT276YCJ6dIYpnjX3CTl1HNjiAyNJwg0ZJI35b4ZCCnOxVekgDUaD aT8VvasHhsuIoJ4adNbowORwkADTKeziVIO8gSSpCPr7TLmfzJS5k4Bmt/kloxLbRg1N hfo6/afpEx2Vf9iwrOpUbmi984cVT2eLX8YqZ2CwHthdQD42DaK87THzU2Ukcdw8WXHi xuepBlYqyvp9u4RfkUY9s2SaQ0g1PLuPMYmaWPACaOzSY0iD5HwpnFXetf1m42Aihq9l umc4Olcr1ilx2WwbfKHHvPUSAkGrsNL0199cnDFw+/UTjqmMwx3X1rvMyuHOmJOpGx64 51gQ== X-Gm-Message-State: AOAM530lAn8/JOTbyqSpv3xEimHZsdWTMWc3tmdIPgSk1DGzGqFqTc0y Np/5huG8maqmVoH6oIUY24yaDdRXPoF7zQ== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , Laszlo Ersek , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philip?= =?utf-8?q?pe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Acked-by: Laszlo Ersek --- Cc: Laszlo Ersek Cc: Philippe Mathieu-Daudé --- 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 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', From patchwork Tue Mar 23 15:51:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158785 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A4860C433DB for ; Tue, 23 Mar 2021 16:38:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 46D2F61585 for ; Tue, 23 Mar 2021 16:38:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 46D2F61585 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43932 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOk3N-0000wm-2b for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:38:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38894) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjJz-0005HW-SF for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:51:55 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:39682) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjJu-0003Ss-Do for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:51:55 -0400 Received: by mail-wm1-x32c.google.com with SMTP id d8-20020a1c1d080000b029010f15546281so10969792wmd.4 for ; Tue, 23 Mar 2021 08:51:49 -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=KiKM+RoVGwWIOpePS9zseVhvSNMHCGpuExN+jkVcnuTMzB35cw7v0h6pnrtjT2N9JX T9/BiWUkDqcfYhj/QdRN3FcIvjhQCf9Vm1Two6SJG3p3DEUSUg8/FcNgUZaN4RlYLMr+ qQS3Dcfiyn5oiVW0jApanIR+M5AubqOXYfWoCXoQzE95Curi4NPoxtqlu8W7XbfMjw/4 bnNWtdsxC16QeQRXCPU/7uDBz+Jt29pCSWNs/Yt/kJipsSKtBshE1aMDW+doXFjCAJF7 6Mxoc4rsnJPp5tlH3AVMnDqnmVpPZpWqYgdCd7BF4LrkvmE3O3KNmqe9fuWLl6a02+CD uFng== X-Gm-Message-State: AOAM530XkoEDNTBO8SM7o5/syC6+0d/tvqpujZFIJ1QNEN6Tjfi1ts8p K2sEZMdk7R0yUt6yAXjexqlUqtp7DO6FoQ== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Weil Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé 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', )) +if host_machine.system() == 'windows' + blobs_ss.add(files( + 'qemu-nsis.bmp', + )) +endif + blobs_ss = blobs_ss.apply(config_host, strict: false) if get_option('install_blobs') From patchwork Tue Mar 23 15:51:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158805 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17804C433C1 for ; Tue, 23 Mar 2021 16:44:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 994B461992 for ; Tue, 23 Mar 2021 16:44:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 994B461992 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOk93-0002K1-Kr for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:44:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjK7-0005ZT-Pa for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:03 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:55167) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjJy-0003W0-KT for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:03 -0400 Received: by mail-wm1-x32c.google.com with SMTP id k128so8929151wmk.4 for ; Tue, 23 Mar 2021 08:51:54 -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=UQB9NoTyQgZmjgpkp1xmVv9Mht99+7D+VASkGyhVgRVdQUFgFfD854j+CnNvCpFTrF Uf7a53T8fxvrdZuz24PUVE6Ly16CZumA3IITNhkMXT+4aLP/7kUiDhelqZ46tYw5Q5ll PCCEjqCOhKh0wkcE4c9U8NvL6TpYveaf8/dl3KEAQeZ7pvrLSjH5rmPwvNzYwL5Mbv/S Zn1nLqUS2rGwRs2/7+SIZDDnGWpe8idmh3O+PReSbKtucW28WMTG5K8UF9ZCg5Lcql2Q ngFIF6Uq4WBUYRy5Da629MJHFvuOvIgFrFC3RGDhTMYG/GbCVKab0BYQZ9f/qd7SC+5C qgLw== X-Gm-Message-State: AOAM532+huXF81HaFfqOJCqoNZal8bTb2iSKyRCFIAaJzaFnVt1WmbWC +amkYNMweLnfE32aVDIFIDEHCkyjcmBLEA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- 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 @@ edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ] install_edk2_blobs = false +install_blobs_alpha = 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'] endforeach endif 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 +if install_blobs_alpha + blobs_ss.add(files( + 'palcode-clipper', + )) +endif + blobs_ss = blobs_ss.apply(config_host, strict: false) if get_option('install_blobs') From patchwork Tue Mar 23 15:51:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158817 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86B08C433DB for ; Tue, 23 Mar 2021 16:48:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2A3BD619C1 for ; Tue, 23 Mar 2021 16:48:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2A3BD619C1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkCV-00072P-TM for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:48:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39226) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKC-0005fB-5M; Tue, 23 Mar 2021 11:52:09 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:45709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjK4-0003ZI-6b; Tue, 23 Mar 2021 11:52:06 -0400 Received: by mail-wr1-x431.google.com with SMTP id 61so21255744wrm.12; Tue, 23 Mar 2021 08:51:59 -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=FNuFdWoGgCxlxkGd8ckXMuGE/2G748hv9OIj6d62uJKfSgw+flg+eg3JuMzaaes4sd 2ktvQXSVpccpo2J6cspiGJnpmZFpn/n1hfufzg3HA8Kze0BEEINxnULtHDKUBvh1ERSK jq3qU+XV5pamB4yP46DVIWiWxzfvC/BUmQIwfYhdVoj+oiMNUQSGFwVwPLKXYu47KCC4 ez129QG1EeDI/cH5MR/BNaZlwqlTF0Pp+MN0GT59i0O068EEHDurrZXiIsLO9O0+rtPY pEvUnstxLyMT4WAypMYARW4XLBvLlra0wDpuRrvE8cwZ3cCTZQl90miRqIHHYFxKQn49 PPMA== X-Gm-Message-State: AOAM532XhkfX8uehATu7PBETrk3zJ+4rpCFWiYs3a0TW5llJvLXSAZxD tJCN4RfQJ572URlj9/lanBiT4TkZmkEczA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@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 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Havard Skinnemoen , Tyrone Ting , qemu-arm@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- 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 = [ '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') From patchwork Tue Mar 23 15:51:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158787 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FE40C433E0 for ; Tue, 23 Mar 2021 16:39:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CE943619BD for ; Tue, 23 Mar 2021 16:39:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CE943619BD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOk4D-0002KT-E7 for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:39:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39346) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKP-0005lz-Iw for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:22 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:34419) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjK8-0003dR-AD for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:20 -0400 Received: by mail-wr1-x433.google.com with SMTP id j7so21304226wrd.1 for ; Tue, 23 Mar 2021 08:52:03 -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=Wz7mdptGH+gUV4ZqtO3MEOd6nGSChF7jPg/+roSfyvVZVY4c4y98Yz6ctGVls/X797 yekWFDUVFdwohYd5qfig2v+hS7YBaBfgD9TDQ4bYPHlcTmULS6E0GdwqrWA3CzA6nA+m R2Nwx4hAyo/l70RNPVvEwfM3/7KXcxnfCYQ9jTxCieox+XewGcfbWtCRsrMcRwDDTYvS jh2F+7UeMGSKxd+aUI1FFdJ3OcxJ1BHM/QN0ExPiKo8yTd62IQWL9cF9NyiS/UzF67qp UjF7tMFsNcUqCJWbDWAVi5ARwMnq+6FJXg1mWsIfqMz4AISALoKsIKN4FFqaFkxpiP0Y dYHQ== X-Gm-Message-State: AOAM530Wg1O1tGnxv1UTcdvh8umMyzK/rlLLZDYVf25XKvHAdXfbnn7n pjhh9FzVF27UngstWuKNrTFOlZkiSsPEAw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Helge Deller Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé 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 = 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') From patchwork Tue Mar 23 15:51:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158791 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 470F1C433C1 for ; Tue, 23 Mar 2021 16:41:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D4B63619B8 for ; Tue, 23 Mar 2021 16:41:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D4B63619B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOk6M-0005pU-0u for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:41:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKT-0005sa-Ti for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:25 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:37628) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjKD-0003ge-R5 for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:25 -0400 Received: by mail-wr1-x436.google.com with SMTP id x16so21275808wrn.4 for ; Tue, 23 Mar 2021 08:52:08 -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=dlotjaFI+yY+mD/EKyfIhbK3JEPTYPEzFMUW2h0WidzQTx/cyJD3VV+OXgkHU22fEw 8WMDjXZOxBiOiAQh2fT3+yO9ZegNuU+bMxQ7TzdE8p1+avXe/8bgxGPocKhBfBQkx28y noL6M77CcwxE3Ny14bW0X8XYR7gjF+5s/OmJYhY5BHIWa3CCNj+MtOm0gvZBwfzD6Aao F3DNInY8JkDEga+JbMvGwLK/SbAdOCamyYMmUegQqiQiIDBg7Hs92WjmyZ91PQqjjGqK 0fdUf/0n4Tkat3XW0mZBPfsIAf1gPb/AopqKMLryG1YLM91/GpRnru3gryE4661iHtC+ 6RJw== X-Gm-Message-State: AOAM530hpa2W0B/GiChQ6vxAs9wLnUF9d7mWBHwaY6xKpOD7wPa1yVcI uF0XvHzEvKCPWlEIFVz471+T0h4U318Aww== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x436.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- 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 = false install_blobs_arm = false install_blobs_hppa = false +install_blobs_microblaze = 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'] + install_blobs_microblaze = install_blobs_microblaze or target in ['microblaze-softmmu', 'microblazeel-softmmu'] endforeach endif 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 +if install_blobs_microblaze + blobs_ss.add(files( + 'petalogix-s3adsp1800.dtb', + 'petalogix-ml605.dtb', + )) +endif + blobs_ss = blobs_ss.apply(config_host, strict: false) if get_option('install_blobs') From patchwork Tue Mar 23 15:51:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158807 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ACBC6C433C1 for ; Tue, 23 Mar 2021 16:46:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4863E619BA for ; Tue, 23 Mar 2021 16:46:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4863E619BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34776 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkAf-0003UP-DI for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:46:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39636) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKd-0006Co-M8; Tue, 23 Mar 2021 11:52:37 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:33715) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjKJ-0003j8-Rc; Tue, 23 Mar 2021 11:52:35 -0400 Received: by mail-wr1-x434.google.com with SMTP id o16so21303555wrn.0; Tue, 23 Mar 2021 08:52:13 -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=LFlwqSJOAm5xMifC0oU7KrDJ+UJz6XA0j63LyNJOyCpvS1jCfQGw88wLQec3SgBIAj ijFmv2fSDGAEwrL61+msFl5lVei4OE27b5oe8unw3GLzJZqlRSOhW17/eS0eoFqjBviY yXwsMvgWDAdrKVpDPdLZEQcwYD+r3lW3Pl1s+NNA3VJvxkdnPp+XgKUbNc57zINB2lpl MwD7AgguPSAR7CXod07DFdH9jpKC3dp5l5NHSXFOdJS6VzH4IHprH9jygQXnbmEQEEZS fGStPDIhZuXJB/2d3UciMdd20JVWoVWAEZbgnBDDp1pQh3n4uNHQvah664Ng6JtcRFRm bK/Q== X-Gm-Message-State: AOAM530BQD2P7XVy4uYWaF6mD//ZM8IQ5fZs7YRR+2cDKuYebTAiBuBc RMVmIpw7ZeRRofg3dIPw4XmLFbCUlJjHMg== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Mark Cave-Ayland , Greg Kurz , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Herv?= =?utf-8?q?=C3=A9_Poussineau?= , qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , Paolo Bonzini , David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Acked-by: David Gibson --- Cc: David Gibson Cc: Greg Kurz Cc: qemu-ppc@nongnu.org Cc: Mark Cave-Ayland Cc: Hervé Poussineau Cc: Cédric 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 = 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') From patchwork Tue Mar 23 15:51:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158801 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EE21C433C1 for ; Tue, 23 Mar 2021 16:42:46 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 16D1261993 for ; Tue, 23 Mar 2021 16:42:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 16D1261993 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOk7B-0007Vf-3c for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:42:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKa-000695-Ll; Tue, 23 Mar 2021 11:52:32 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:43849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjKN-0003jm-Lk; Tue, 23 Mar 2021 11:52:32 -0400 Received: by mail-wr1-x432.google.com with SMTP id e9so21286895wrw.10; Tue, 23 Mar 2021 08:52:18 -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=gGK1kaVnHUSiJvtY+O9RC2PnE8+G4tOCyrZzDwZQbKVgtQXxQrGjBuMdEj/b3Eg9/j bS/kGAbYb+LLx2A+gl52bkuQ0kt80flIH+sGYQnXt/Ec9+gsv1CeFg2EZ6adpfNq+jJx o2w/8tIp4gaImHlzPkck5hdqc/ooim+6JYqsLXcsYfLBBCSY5aVu0CCDT09wHiWJLCo1 Y6jyRxUDIxlyS178SZ5TkCepLML3VJjzy0YN+ewbvtwrgGL08/MbrQM+zwtJIzjhQj9M 5FQYDr+BJyjX95PHbqwITo9VK3i6rFKP0/8PkgT4/GRiCJ4ilGWTrFnKLEIiLtPBMohQ tO+g== X-Gm-Message-State: AOAM530xW0yEhTyujPnbPrJPPodKhGZT/KKeaf3Gm7vONAHUf4tnzGZD BMfTWlVpUl1D1qXVKxBrCbWU4pj7jkmFtA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@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 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-riscv@nongnu.org, Sagar Karandikar , Bastian Koppelmann , =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , Palmer Dabbelt , Paolo Bonzini , Alistair Francis Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé 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 = false install_blobs_microblaze = false install_blobs_ppc = false +install_blobs_riscv = false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs = install_edk2_blobs or target in edk2_targets @@ -106,6 +107,7 @@ 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')) + install_blobs_riscv = install_blobs_riscv or target in ['riscv32-softmmu', 'riscv64-softmmu'] endforeach endif 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', )) if host_machine.system() == 'windows' @@ -116,6 +112,15 @@ )) endif +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 = blobs_ss.apply(config_host, strict: false) if get_option('install_blobs') From patchwork Tue Mar 23 15:51:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158823 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B809C433C1 for ; Tue, 23 Mar 2021 16:51:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 33445619B8 for ; Tue, 23 Mar 2021 16:51:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33445619B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkFs-0003uc-9s for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:51:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKf-0006DY-HG; Tue, 23 Mar 2021 11:52:39 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:43916) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjKS-0003m6-28; Tue, 23 Mar 2021 11:52:36 -0400 Received: by mail-wm1-x333.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so11120325wmj.2; Tue, 23 Mar 2021 08:52:23 -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=aHDVY4YMHzIGtUjVAlRroHOFkzUUSVb6kCBPzCOPIUQsVJuqibHuMt8hAbf+yNMq5f yFoQIcyktJ8z5lSWcXnDmCehPS9HtExzZybtzrPilRWFdGezHPwwkNf46NfxD8oSoUam oE6e+xe1X0zHGz0xe0cJNlHTLdDFRYB0PClml4gDe2SsEuEW/xKehujqYHXkM9KBmsqi w72xpTklUoPYeRPd80HtqyqWb8uMU5PVWi1yLEmWF5ftisbkeYXRQ8KJIrlb2Dms9a0k 2dI6XEcKh3nBrbXmsU2sEKb7uGhxslA4BnA5WuhtAn845yGZAyiyDVsE//e+tso6FsnI Z7Hg== X-Gm-Message-State: AOAM532vii4mkeLgc6ogWezhXgsz8QAQurCSlhc/tBU1VsKZB/PzN2qk Hr7s0wuMvfCg5Er1bxq/ML1eBJ3N76nHaA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@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 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Paolo Bonzini , Thomas Huth , Cornelia Huck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Acked-by: Cornelia Huck --- 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 = false install_blobs_ppc = false install_blobs_riscv = false +install_blobs_s390x = false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs = install_edk2_blobs or target in edk2_targets @@ -108,6 +109,7 @@ 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')) install_blobs_riscv = install_blobs_riscv or target in ['riscv32-softmmu', 'riscv64-softmmu'] + install_blobs_s390x = install_blobs_s390x or target in ['s390x-softmmu'] endforeach endif 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', )) if host_machine.system() == 'windows' @@ -121,6 +119,13 @@ )) endif +if install_blobs_s390x + blobs_ss.add(files( + 's390-ccw.img', + 's390-netboot.img', + )) +endif + blobs_ss = blobs_ss.apply(config_host, strict: false) if get_option('install_blobs') From patchwork Tue Mar 23 15:51:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158825 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A829DC433C1 for ; Tue, 23 Mar 2021 16:54:00 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4473361992 for ; Tue, 23 Mar 2021 16:53:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4473361992 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkI2-0007W8-UV for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:53:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKn-0006Hg-Aq for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:48 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:39565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjKW-0003ow-8A for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:44 -0400 Received: by mail-wr1-x431.google.com with SMTP id e18so21297422wrt.6 for ; Tue, 23 Mar 2021 08:52:27 -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=QPZaV5DX/mzJ5vkZMJmZOO1h1bFkgpZk2NGJinv/SLwFi2k0Nha4yrAj/ou3gE9C0i ZgUxg4WrkGnYOpxAQRwUS2ZCXjqkJe8Jat19igymjyCBlAfA57l6blfdpJjqHjTwY4WM qavd87rfsDI1XGdkbyLh15qimjKfDBrM/zEHLlP+vXAvzSb9XXMUsIi4eZPitd6RsJvJ dsChBt4Zq8QvFP15DhFoqCg+s0wXWl3l3pWf5G0se2myd0fDc+CT41G/s7CpUTXrAY3N YY50UiBGbY8FAnuxOpE8KZIeDwYGF1q4ip+xH6nAhNy+3hfPqxIB4nyQk9wDUWsXALa0 L7qQ== X-Gm-Message-State: AOAM532gmiJC0QLctYyupw6D0g/3c83SzgCfyfiemBWoCYZhbee72Su+ 0y3Z6DJhkOlgP0rYI70+OJzjcGPhO4L2Xw== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Artyom Tarasenko Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- 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 = false install_blobs_riscv = false install_blobs_s390x = false +install_blobs_sparc = false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs = install_edk2_blobs or target in edk2_targets @@ -110,6 +111,7 @@ install_blobs_ppc = install_blobs_ppc or (target.startswith('ppc') and target.endswith('softmmu')) install_blobs_riscv = install_blobs_riscv or target in ['riscv32-softmmu', 'riscv64-softmmu'] install_blobs_s390x = install_blobs_s390x or target in ['s390x-softmmu'] + install_blobs_sparc = install_blobs_sparc or target in ['sparc-softmmu', 'sparc64-softmmu'] endforeach endif 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 +if install_blobs_sparc + blobs_ss.add(files( + 'openbios-sparc32', + 'openbios-sparc64', + )) +endif + blobs_ss = blobs_ss.apply(config_host, strict: false) if get_option('install_blobs') From patchwork Tue Mar 23 15:51:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158827 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBCF8C433C1 for ; Tue, 23 Mar 2021 16:57:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61A306192E for ; Tue, 23 Mar 2021 16:57:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61A306192E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:35320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkLt-0004KI-GS for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:57:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39762) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKp-0006Hm-LE for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:48 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:33719) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjKb-0003sy-0y for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:46 -0400 Received: by mail-wr1-x435.google.com with SMTP id o16so21304661wrn.0 for ; Tue, 23 Mar 2021 08:52:32 -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=OO+rjj2fWC9gy++MjE+vSCmxJxod4S8PVHiahJ3ovVbogUpRnAVmmSpIP+f9Y4MPIs 7NmwIg86FESCXqZ1ez4M3Dq2bA7Iitb6/6V4hel6GUEL01g9b0kA3mran6S02tk9GkmH SRELdvqPMqBK4xv26afv0Iqc2cJg8didowdVbU7ywOVK8I4qAjOpMrvRcvdXuHBa22Yd SKyMeB6T7Cog/iVUSZjELcPdlB3VATC5Ef5yfCe00csf+A+8OgZcOZ+sOb8VjytCa7r9 0XcfmVnH8HEScwY+53WaZ6xAq25O4oc6GFN51AllRPboMHOAfuUOOPar92kgwvSUacm7 ZqpQ== X-Gm-Message-State: AOAM5336/O7n7W0mEbVmHxvatAFI5hUt0F3dxGqwvyZ8L1sn7TRd/8HV svJFqufOWfaSfz6h0Wpo85pAc7Xd49AclA== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::435; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Eduardo Habkost , "Michael S . Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- 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 = false install_blobs_s390x = false install_blobs_sparc = false +install_blobs_x86 = false if get_option('install_blobs') foreach target : target_dirs install_edk2_blobs = install_edk2_blobs or target in edk2_targets @@ -112,6 +113,7 @@ install_blobs_riscv = install_blobs_riscv or target in ['riscv32-softmmu', 'riscv64-softmmu'] install_blobs_s390x = install_blobs_s390x or target in ['s390x-softmmu'] install_blobs_sparc = install_blobs_sparc or target in ['sparc-softmmu', 'sparc64-softmmu'] + install_blobs_x86 = install_blobs_x86 or target in ['i386-softmmu', 'x86_64-softmmu'] endforeach endif 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 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', )) if host_machine.system() == 'windows' @@ -131,6 +122,20 @@ )) endif +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 = blobs_ss.apply(config_host, strict: false) if get_option('install_blobs') From patchwork Tue Mar 23 15:51:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12158819 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C63E0C433DB for ; Tue, 23 Mar 2021 16:49:17 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E78A619BA for ; Tue, 23 Mar 2021 16:49:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5E78A619BA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=amsat.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:43190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lOkDU-0008N2-3t for qemu-devel@archiver.kernel.org; Tue, 23 Mar 2021 12:49:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lOjKu-0006KT-4W for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:53 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:35508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lOjKg-0003uI-RR for qemu-devel@nongnu.org; Tue, 23 Mar 2021 11:52:48 -0400 Received: by mail-wr1-x433.google.com with SMTP id j18so21283365wra.2 for ; Tue, 23 Mar 2021 08:52:37 -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=QJw6qdh5ABPBEi/9rXlPvfNHXfx2CPqAQDoo+fp50zfSKCoXyZLQFPVNo1Q1TjpLsi 3GGruCerIQjIsFA8uUeT93MpA8NgmSfJqK2QKiMuPiDyBWoppt7/nHQdq+j0/zz+l/w8 UeFAzpoX7jt00cR+7eR/6e3scP9bJXJpt0QJaJG+19U/3qsYInEgdKEBXGVx+J1MBzXD nf4VFfQMIX0lKeiZQUg9S4A89jMHq2eaP7hxw+DyVqcb6/ZOfbEYG1i9aKnoiEI0jgIl 87bJoiCDyeHZZpEAfuEZyg+sFyGfrXyHUvUQ5UkmJKk8f/At1euUByBeJ8inpdGEzTYD Yp0w== X-Gm-Message-State: AOAM532dvikTpzMLFJQHADWxZ1rwpUdSuUZheBuj7ZwqBiUsomRGQbUu UKnIouPHvuRoX60/MywP1SVJLvwMf57IQQ== 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) 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org 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 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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é 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 @@ subdir('scripts') subdir('tools') -subdir('pc-bios') +if have_system + subdir('pc-bios') +endif subdir('docs') subdir('tests') if gtk.found()