From patchwork Thu Jul 16 05:56:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11666727 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8B618618 for ; Thu, 16 Jul 2020 05:57:33 +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 623B32065E for ; Thu, 16 Jul 2020 05:57:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d3b8bHtH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 623B32065E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:57762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvwtg-00070k-M1 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jul 2020 01:57:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46682) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvwsp-0005eL-6p; Thu, 16 Jul 2020 01:56:39 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvwsn-0000Kn-Lj; Thu, 16 Jul 2020 01:56:38 -0400 Received: by mail-wm1-x344.google.com with SMTP id f18so9714444wml.3; Wed, 15 Jul 2020 22:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BHeKtHmNWiAjV5Xy3SbLdEwwCu4Vu5ZZ6NV6lX457O4=; b=d3b8bHtHOLqMe8zIUGln1BEIdLByd+SFIqRGoysSJfp1vT2mXtRfXMd1dam+edHfTf gFuLaN9lhWj/xjjtxVtmDYbaLwj95T7RMpmaLs/jRjpI/dozjgTKj0BRKkyJBlhBeXDl 1G9iMPA70vThqO3ZEXuGl1bXV6SsZ1VcUm/Wl+JqTfQ0KcZ9iBSQnnahNzEFzE6MYQhW Ta30/2CtGvMVmWICgqHZT6GGtSY6yqsIDwoy3w8WGHbFzUY+iSsAA1/u0reHDxdvkaIO w5Je7xrfWCwVukDgsizwflWn4QD0SjUQqBD0So/xVd2CxWpQE//A1FhWUdAx3zSG47zr kjOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BHeKtHmNWiAjV5Xy3SbLdEwwCu4Vu5ZZ6NV6lX457O4=; b=LqOPDYlvHibZI6lCMu7VdteZ7vVMnRoxpV430GhqWbMsUwfitGVaXWQ1Xi2KFZn0Rq IJ3Ky2jplCiuSXo5Ixxj4AkIZMVYZWTrNtkNUMp5sLuH6DBEsfp4jKvuSzh3ivUvhLmi peZVGxTccS1P4emnqWBwLOytv5t92uopAQYsc0UQLJ7W8XKALjIRVYi/+NMFdcDG5B0O NIk4uGcQlW/pA5oairnxZ3kqTEtE6i+x3TGPobFFMt381Qevw9XG0XYBwuP/cfh1a1Hk AbrjKM5kemajMG0lyS93EqOzx1qOUhWi+ZBnh6Z6BPLF0POsQH35kp8bmJPN2m8dXY/y qTIQ== X-Gm-Message-State: AOAM532vJSzpyvRqIh7yJR4nWyqh+0iVbNkvILErrkA4D+K6zzpaxiJr QNQyrdMne8cMYNq1hijYebg= X-Google-Smtp-Source: ABdhPJye6fll3K++lOytsGfUhED+dT4+vl7x9X07FmaRhUexyW4CUHQKQv5BHfIAvhc1g8wHET4kLg== X-Received: by 2002:a7b:c936:: with SMTP id h22mr2654430wml.114.1594878995257; Wed, 15 Jul 2020 22:56:35 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id f12sm7193458wrw.53.2020.07.15.22.56.33 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Jul 2020 22:56:34 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v5 1/7] configure: Create symbolic links for pc-bios/*.elf files Date: Wed, 15 Jul 2020 22:56:05 -0700 Message-Id: <1594878971-26050-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> References: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::344; envelope-from=bmeng.cn@gmail.com; helo=mail-wm1-x344.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Anup Patel , Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Now we need to ship the OpenSBI fw_dynamic.elf image for the RISC-V Spike machine, it requires us to create symbolic links for pc-bios/*.elf files. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis --- (no changes since v2) Changes in v2: - new patch: configure: Create symbolic links for pc-bios/*.elf files configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index b751c85..af027c5 100755 --- a/configure +++ b/configure @@ -8584,6 +8584,7 @@ LINKS="$LINKS tests/qemu-iotests/check" LINKS="$LINKS python" for bios_file in \ $source_path/pc-bios/*.bin \ + $source_path/pc-bios/*.elf \ $source_path/pc-bios/*.lid \ $source_path/pc-bios/*.rom \ $source_path/pc-bios/*.dtb \ From patchwork Thu Jul 16 05:56:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11666731 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BDE9D618 for ; Thu, 16 Jul 2020 05:58:48 +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 928FC2065E for ; Thu, 16 Jul 2020 05:58:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kBdT5d8T" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 928FC2065E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:35904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvwut-00017e-Sc for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jul 2020 01:58:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvwsr-0005fo-Kq; Thu, 16 Jul 2020 01:56:41 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:40556) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvwsp-0000L1-R6; Thu, 16 Jul 2020 01:56:41 -0400 Received: by mail-wm1-x32b.google.com with SMTP id f139so9721387wmf.5; Wed, 15 Jul 2020 22:56:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YoykrVtjYqt8oRbnP42shFLWN1mv4jmw4/LHlHynF4c=; b=kBdT5d8T5IyPmNxFgjdDqoZ3KFrZcM5nHb47Cuvcd04cmx7rm3GTascv3NmtTycHJ0 vg4zzWrpmAOQl++usns8ZvOTrQu60LniB7J6MRhv015L8bGfKbmvkV/hGIZpAlm75uZr X68PwT8MPZebOP76P6I76RiJCFeky7HKqnb9JGPkA7uUN2aNvzIJ56sEyu98w6XCOuJX OhhV3X0Pv5AuRYRcds/TUJTyU+dQLD4Z14SNBn+E92QR0GmG8WXkVNzrUC7vMM+3AtXe SHGslr5Q8S5Qx4Jzf/MV+Lnvr05N2SuOmUXyW3dowiyfUuC06ApQxgCcaEozRgUo/kXq t7vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YoykrVtjYqt8oRbnP42shFLWN1mv4jmw4/LHlHynF4c=; b=Borzabavigw1U9veeVWH3tp4Gz6Fuw3+4G0S1/r/9NQiKNP2U8Psuu6uhdLTeBmUPd gNk2f4qHWH+JpD7vAbv1JF0KA+8GkTtNvm916to27v2A1dOni4q3ll3XGCFdq7f7Qg4m WQYie9u+t9AtcNtsfr0pKP4MaEKt3jg9Sb7X8qu9hYNk3MROQS3pqxGqvciSy4RV6Qt1 g7cNswuLgvS3N2lkn4fspatFAU3TmexOilvTcdg0jST9tYM4TkEOXy+AYs7spVP4TuK6 GGgLyQLgChEtw5VQvYAKHDLk7CDNwVBEFE+lCvTzMy5d08uU/SsfrwT3c6haN6i8b7nl +14g== X-Gm-Message-State: AOAM5317NfQG6fU6aP2dWyu6U5gsmuuT9Egm6ILTd7a3VOw78r/+uctR zpggwExk8/igqCaM14Uu5aw= X-Google-Smtp-Source: ABdhPJyu3z2D+5TGGDcnRiS5/hjk4uROU1VkH2MrkYMSKgDp4sUOkcMmIxSuoculHMilhZBAm8B4bg== X-Received: by 2002:a7b:cb92:: with SMTP id m18mr2694443wmi.94.1594878997659; Wed, 15 Jul 2020 22:56:37 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id f12sm7193458wrw.53.2020.07.15.22.56.35 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Jul 2020 22:56:37 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v5 2/7] roms/opensbi: Upgrade from v0.7 to v0.8 Date: Wed, 15 Jul 2020 22:56:06 -0700 Message-Id: <1594878971-26050-3-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> References: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=bmeng.cn@gmail.com; helo=mail-wm1-x32b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham 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: Anup Patel , Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Upgrade OpenSBI from v0.7 to v0.8. The v0.8 release includes the following commits: 1bb00ab lib: No need to provide default PMP region using platform callbacks a9eac67 include: sbi_platform: Combine reboot and shutdown into one callback 6585fab lib: utils: Add SiFive test device 4781545 platform: Add Nuclei UX600 platform 3a326af scripts: adapt binary archive script for Nuclei UX600 5bdf022 firmware: fw_base: Remove CSR_MTVEC update check e6c1345 lib: utils/serial: Skip baudrate config if input frequency is zero 01a8c8e lib: utils: Improve fdt_parse_uart8250() API 0a0093b lib: utils: Add fdt_parse_uart8250_node() function 243b0d0 lib: utils: Remove redundant clint_ipi_sync() declaration e3ad7c1 lib: utils: Rename fdt_parse_clint() to fdt_parse_compat_addr() a39cd6f lib: utils: Add FDT match table based node lookup dd33b9e lib: utils: Make fdt_get_node_addr_size() public function 66185b3 lib: utils: Add fdt_parse_sifive_uart_node() function 19e966b lib: utils: Add fdt_parse_hart_id() function 44dd7be lib: utils: Add fdt_parse_max_hart_id() API f0eb503 lib: utils: Add fdt_parse_plic_node() function 1ac794c include: Add array_size() macro 8ff2b94 lib: utils: Add simple FDT timer framework 76f0f81 lib: utils: Add simple FDT ipi framework 75322a6 lib: utils: Add simple FDT irqchip framework 76a8940 lib: utils: Add simple FDT serial framework 7cc6fa4 lib: utils: Add simple FDT reset framework 4d06353 firmware: fw_base: Introduce optional fw_platform_init() f1aa9e5 platform: Add generic FDT based platform support 1f21b99 lib: sbi: Print platform hart count at boot time 2ba7087 scripts: Add generic platform to create-binary-archive.sh 4f18c6e platform: generic: Add Sifive FU540 TLB flush range limit override 13717a8 platform: Remove qemu/virt directory 65c06b0 platform: Remove spike directory d626037 docs: Add missing links in platform.md 7993ca2 include: sbi: Remove redundant page table related defines 5338679 lib: sbi_tlb: Fix remote TLB HFENCE VVMA implementation dc38929 lib: sbi: Improve misa_string() implementation 433bac7 docs: platform/generic: Add details about stdout-path DT property b4efa70 docs: platform/generic: Add details about IPI and timer expectations dfd9dd6 docs: Add platform requirements document c2286b6 docs: Fix ordering of pages in table of contents 7be75f5 docs: Don't use italic text in page title 63a513e lib: Rename unprivileged trap handler aef9a60 lib: Add csr detect support 13ca20d lib: Create a separate math helper function file 79d0fad lib: utils: Update reserved memory fdt node even if PMP is not present 6a053f6 lib: Add support for hart specific features b2df751 platform: Move platform features to hart 4938024 platform: fpga: Remove redundant platform specific features ec0d2a7 lib: timer: Provide a hart based timer feature 1f235ec lib: Add platform features in boot time print 22c4334 lib: Add hart features in boot time print 36833ab lib: Optimize inline assembly for unprivilege access functions 38a4b54 firmware: Correct spelling mistakes 28b4052 lib: sbi: detect features before everything else in sbi_hart_init() 4984183 lib: sbi: Improve get_feature_str() implementation and usage 3aa1036 lib: sbi: Remove extra spaces from boot time prints 3a8fc81 lib: sbi: Print platform HART count just before boot HART id 63b0f5f include: sbi: Use scratch pointer as parmeter in HART feature APIs 2966510 lib: sbi: Few cosmetic improvements to HART feature detection a38bea9 lib: sbi_hart: Detect number of supported PMP regions 89ba634 include: sbi: Add firmware extension constants 73d6ef3 lib: utils: Remove redundant parameters from PLIC init functions 446a9c6 lib: utils: Allow PLIC functions to be used for multiple PLICs 2c685c2 lib: utils: Extend fdt_find_match() Implementation d30bb68 lib: utils/irqchip: Initialize all matching irqchip DT nodes a9a9751 lib: utils: Allow CLINT functions to be used for multiple CLINTs 569dd64 lib: utils: Add fdt_parse_clint_node() function 6956e83 lib: utils/ipi: Initialize all matching ipi DT nodes a63f05f lib: utils/timer: Initialize all matching timer DT nodes 30b6040 Makefile: Fix builtin DTB compilation for out-of-tree platforms 64f1408 firmware: fw_base: Make builtin DTB available to fw_platform_init() 4ce6b7a firmware: fw_base: Don't OR forced FW_OPTIONS 86ec534 firmware: Allow fw_platform_init() to return updated FDT location c6c65ee Makefile: Preprocess builtin DTS 4e3876d Makefile: Add mechanism for platforms to have multiple builtin DTBs 72019ee platform: kendryte/k210: Use new mechanism of builtin DTB 51f0e4a firmware: Remove FW_PAYLOAD_FDT and related documentation 1b8c012 lib: Add RISC-V hypervisor v0.6.1 support 79bfd67 docs: Use doxygen config to mark the main page 106b888 docs: Remove redundant documentation about combined payload use case 9802906 platform: Add AE350 platform specific SBI handler 32f87e5 platform: Add AE350 cache control SBIs e2c3f01 lib: Fix __sbi_hfence_gvma_vmid_gpa() and __sbi_hfence_vvma_asid_va() 6966ad0 platform/lib: Allow the OS to map the regions that are protected by PMP 518e85c platform: Update Nuclei ux600 platform support d5725c2 lib: Don't print delegation CSRs if there is no S-Mode 637b348 lib: Fix the SBI_HART_HAS_MCOUNTEREN feature check db56ef3 platform: Add support for Shakti C-class SoC from IIT-M 9bd5f8f lib: sbi: Fix 32/64 bits variable compatibility 2314101 lib: Don't return any invalid error from SBI ecall a98258d include: Bump-up version to 0.8 Signed-off-by: Bin Meng Reviewed-by: Anup Patel Reviewed-by: Alistair Francis --- (no changes since v2) Changes in v2: - Upgrade OpenSBI to v0.8 release roms/opensbi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roms/opensbi b/roms/opensbi index 9f1b72c..a98258d 160000 --- a/roms/opensbi +++ b/roms/opensbi @@ -1 +1 @@ -Subproject commit 9f1b72ce66d659e91013b358939e832fb27223f5 +Subproject commit a98258d0b537a295f517bbc8d813007336731fa9 From patchwork Thu Jul 16 05:56:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11666729 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id ED6621392 for ; Thu, 16 Jul 2020 05:57:40 +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 C38662070E for ; Thu, 16 Jul 2020 05:57:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XDNrb2xa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C38662070E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:58444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvwto-0007HD-2E for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jul 2020 01:57:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvwst-0005ia-C3; Thu, 16 Jul 2020 01:56:43 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:39477) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvwsr-0000LI-Lb; Thu, 16 Jul 2020 01:56:43 -0400 Received: by mail-wr1-x444.google.com with SMTP id q5so5679522wru.6; Wed, 15 Jul 2020 22:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rwBr69aKqgDUi0/A7pROTSLiqSwaDFaBxL8GlGAjDF0=; b=XDNrb2xaXHbVeeKZEKUWajzTTeC8YvTKO050/8o19Tpb0QMxaC8LvDWjas5fRqFs/e FLnayai7PdpZuoA6Fha7L/LubOTEyM3fcuh3XBSUpVeA7m5U2BKGuESFyJ7nMC78oYcB wUugFoaizPkocMqBY8QKuJGlv9O61wcNNa0ZaMPvc/+F+x045UJD2lwrv/d/EA3dS+kS 4IcvWNWDkxAzJt+rykOX6wQApPHPGcxqi3h/BooIIbEa2QmUWjSwck6RgpSwpxxUsKFH KLN8GjcFwgMV7nOR9NQgjsB6B0i3IpXmnwlreXHxUQGYDGZzmKyEoYZjHl92WNKSOSJN pfvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rwBr69aKqgDUi0/A7pROTSLiqSwaDFaBxL8GlGAjDF0=; b=lxnnC10KLp83YEWmwtHrR7E1bljq1iBcxu04Gl9bno2BOQX9uKgYIoEgs08Y6UncAh v4tj091qF39MTLawFqGoP+j5YPFnUL8rUXBYl+A0XjFSTPoCzSDiqwvzLXz6D3TKrVWz qj0Gfp2jVf2dIvs9VcUcTLnuncaJiV8dboGUKAj7/09vVUMWGlzW4f5WRxjikITn5RpC OxJweqtKCCqnRELJsYcckmrAQTrH+a/2JWXuerXHYZLhUUW7vTvxq8O/d24TVRcN0PGm 4yMzMIcRlOKhS5wh6bi1WdfoIx9HWbIRDaRzmUrLA1aemcXCByrSb917ZykqB29bEA+t Z02w== X-Gm-Message-State: AOAM532n1Ue41ZwlPg4G1rMV+iiDzoMBWok9+3MSpu7nifwYyIPPIHt+ 3ZcepFHw/KNdaZesp/H95tg= X-Google-Smtp-Source: ABdhPJxEmBWddO2zhVnwKqLtMyjP7mvYCbIDZh4HOm2zWwlK99SDM1mlyAHmPb7UQtFgCV5FU51kuA== X-Received: by 2002:a5d:60c7:: with SMTP id x7mr3160873wrt.138.1594879000072; Wed, 15 Jul 2020 22:56:40 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id f12sm7193458wrw.53.2020.07.15.22.56.37 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Jul 2020 22:56:39 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v5 3/7] roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware Date: Wed, 15 Jul 2020 22:56:07 -0700 Message-Id: <1594878971-26050-4-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> References: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=bmeng.cn@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Anup Patel , Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng The RISC-V generic platform is a flattened device tree (FDT) based platform where all platform specific functionality is provided based on FDT passed by previous booting stage. The support was added in the upstream OpenSBI v0.8 release recently. Update our Makefile to build the generic platform instead of building virt and sifive_u separately for RISC-V OpenSBI firmware, and change to use fw_dynamic type images as well. Signed-off-by: Bin Meng Reviewed-by: Anup Patel Reviewed-by: Alistair Francis --- (no changes since v3) Changes in v3: - Change fw_jump to fw_dynamic in the make rules Changes in v2: - Copy the ELF images too in the make rules roms/Makefile | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/roms/Makefile b/roms/Makefile index f9acf39..5d9f15b 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -64,10 +64,8 @@ default help: @echo " u-boot.e500 -- update u-boot.e500" @echo " u-boot.sam460 -- update u-boot.sam460" @echo " efi -- update UEFI (edk2) platform firmware" - @echo " opensbi32-virt -- update OpenSBI for 32-bit virt machine" - @echo " opensbi64-virt -- update OpenSBI for 64-bit virt machine" - @echo " opensbi32-sifive_u -- update OpenSBI for 32-bit sifive_u machine" - @echo " opensbi64-sifive_u -- update OpenSBI for 64-bit sifive_u machine" + @echo " opensbi32-generic -- update OpenSBI for 32-bit generic machine" + @echo " opensbi64-generic -- update OpenSBI for 64-bit generic machine" @echo " bios-microvm -- update bios-microvm.bin (qboot)" @echo " clean -- delete the files generated by the previous" \ "build targets" @@ -170,29 +168,19 @@ skiboot: efi: edk2-basetools $(MAKE) -f Makefile.edk2 -opensbi32-virt: +opensbi32-generic: $(MAKE) -C opensbi \ CROSS_COMPILE=$(riscv32_cross_prefix) \ - PLATFORM="qemu/virt" - cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-virt-fw_jump.bin + PLATFORM="generic" + cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv32-generic-fw_dynamic.bin + cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv32-generic-fw_dynamic.elf -opensbi64-virt: +opensbi64-generic: $(MAKE) -C opensbi \ CROSS_COMPILE=$(riscv64_cross_prefix) \ - PLATFORM="qemu/virt" - cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-virt-fw_jump.bin - -opensbi32-sifive_u: - $(MAKE) -C opensbi \ - CROSS_COMPILE=$(riscv32_cross_prefix) \ - PLATFORM="sifive/fu540" - cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin - -opensbi64-sifive_u: - $(MAKE) -C opensbi \ - CROSS_COMPILE=$(riscv64_cross_prefix) \ - PLATFORM="sifive/fu540" - cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin + PLATFORM="generic" + cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin + cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf bios-microvm: $(MAKE) -C qboot From patchwork Thu Jul 16 05:56:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11666733 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6377F1392 for ; Thu, 16 Jul 2020 05:58: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 390702065E for ; Thu, 16 Jul 2020 05:58:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NBs8Aq6V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 390702065E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:36034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvwuv-0001As-GS for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jul 2020 01:58:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvwsv-0005pM-TF; Thu, 16 Jul 2020 01:56:45 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:35431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvwsu-0000LY-4s; Thu, 16 Jul 2020 01:56:45 -0400 Received: by mail-wm1-x341.google.com with SMTP id l2so9755672wmf.0; Wed, 15 Jul 2020 22:56:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=TIOV1TSTMNVa25r8cgh5HeGElRw6XrfV2LxFYJnmpgY=; b=NBs8Aq6V7+cISc2n4BSZ9p5uhGzZ0mf+Ao7EyRJlW8lmm6yt8D6otS8nuT5qwv1wGs ld4ya4iWbwKXIjRQv2kDVvDSWVzH218XVM05XyF1+TEww2/3pF8imXdE3hdqk6b5qovQ 2LBWzrI3vMLibCtwEmlsqt99bdPfQ9IjMjMMNBR6D0ZCWRpo57hCZ6Lzm/I/YwC8wLXy JpqGgD9l7ExjUb/EZi5NQ64RxGeo4g6voSdDnQPXoB1YY/lWAdoP8Ig6ceFiKf0x22vk 2nuVBAjrnjoutEEgJW4eRCmMdouFzvdviESe3QmyafPRmljSKxsluxAnhwRxa5r0OkPV FK6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=TIOV1TSTMNVa25r8cgh5HeGElRw6XrfV2LxFYJnmpgY=; b=YMHrt8+rh18GAReaXB4Qbyj3Pci2bHekqCGRfeGlz1kPLnmg9qwT5qyuVrFmQ5owlr ZqBM5ixBXOdutM66wVT144qOeO/837qqkTxs1RwyRE7dXq+WzmfRbyruEibXjv5Bzcix CZVL7Ec/YnxhL3m34jJscUrYI6z9iuZbXD8aloTqwcuWstqOkdi5NlDcQVzRMVXqbvfv zOr24qy0/4QfNqSS90enLHD4E7BY47Ej8E1z366JESzgSZbCg9QxfQkAqnI86fAIYCFV EaoZKB3C2ZOG892uENaNMouIMECYH1WV87jebBCaDCIr8AEzzOSExY0IuBGsHAlzPqcT MBvQ== X-Gm-Message-State: AOAM5329WnQWPwTpcXeKe4HCi4aYx6cd8yTh/6QyH86jmM/utiQomXis qr0Z3tOC/K/KDGUHONi8TRI= X-Google-Smtp-Source: ABdhPJzfqxsbGAOFn0CoY8WLe0s9sstkWHNZzsaPPKrULo9hb7+jqDx/oxYiCyrX9SAv5V/XAR/z9w== X-Received: by 2002:a1c:4d05:: with SMTP id o5mr2752124wmh.130.1594879002463; Wed, 15 Jul 2020 22:56:42 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id f12sm7193458wrw.53.2020.07.15.22.56.40 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Jul 2020 22:56:41 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v5 4/7] hw/riscv: Use pre-built bios image of generic platform for virt & sifive_u Date: Wed, 15 Jul 2020 22:56:08 -0700 Message-Id: <1594878971-26050-5-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> References: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::341; envelope-from=bmeng.cn@gmail.com; helo=mail-wm1-x341.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Anup Patel , Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng Update virt and sifive_u machines to use the opensbi fw_dynamic bios image built for the generic FDT platform. Remove the out-of-date no longer used bios images. Signed-off-by: Bin Meng Reviewed-by: Anup Patel Reviewed-by: Alistair Francis --- Changes in v5: - Include the generic fw_dynamic.bin in the Makefile for `make install` bisection Changes in v4: - Remove old binaries in the Makefile for `make install` bisection Changes in v3: - Change to fw_dynamic.bin for virt & sifive_u Makefile | 3 +-- hw/riscv/sifive_u.c | 4 ++-- hw/riscv/virt.c | 4 ++-- pc-bios/opensbi-riscv32-generic-fw_dynamic.bin | Bin 0 -> 62144 bytes pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin | Bin 49520 -> 0 bytes pc-bios/opensbi-riscv32-virt-fw_jump.bin | Bin 49504 -> 0 bytes pc-bios/opensbi-riscv64-generic-fw_dynamic.bin | Bin 0 -> 70792 bytes pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 57936 -> 0 bytes pc-bios/opensbi-riscv64-virt-fw_jump.bin | Bin 57920 -> 0 bytes 9 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.bin delete mode 100644 pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin delete mode 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.bin delete mode 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin delete mode 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin Binary files a/pc-bios/opensbi-riscv64-virt-fw_jump.bin and /dev/null differ diff --git a/Makefile b/Makefile index 32345c6..a6d6234 100644 --- a/Makefile +++ b/Makefile @@ -841,8 +841,7 @@ u-boot.e500 u-boot-sam460-20100605.bin \ qemu_vga.ndrv \ edk2-licenses.txt \ hppa-firmware.img \ -opensbi-riscv32-sifive_u-fw_jump.bin opensbi-riscv32-virt-fw_jump.bin \ -opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin +opensbi-riscv32-generic-fw_dynamic.bin opensbi-riscv64-generic-fw_dynamic.bin DESCS=50-edk2-i386-secure.json 50-edk2-x86_64-secure.json \ diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index 19a976c..6487d5e 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -60,9 +60,9 @@ #include #if defined(TARGET_RISCV32) -# define BIOS_FILENAME "opensbi-riscv32-sifive_u-fw_jump.bin" +# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin" #else -# define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin" +# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin" #endif static const struct MemmapEntry { diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 55a907b..6e91cf1 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -43,9 +43,9 @@ #include "hw/pci-host/gpex.h" #if defined(TARGET_RISCV32) -# define BIOS_FILENAME "opensbi-riscv32-virt-fw_jump.bin" +# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin" #else -# define BIOS_FILENAME "opensbi-riscv64-virt-fw_jump.bin" +# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin" #endif static const struct MemmapEntry { diff --git a/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin b/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin new file mode 100644 index 0000000..23b4dfb Binary files /dev/null and b/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin differ diff --git a/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin b/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin deleted file mode 100644 index 3e0da54..0000000 Binary files a/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin and /dev/null differ diff --git a/pc-bios/opensbi-riscv32-virt-fw_jump.bin b/pc-bios/opensbi-riscv32-virt-fw_jump.bin deleted file mode 100644 index bc56ed6..0000000 Binary files a/pc-bios/opensbi-riscv32-virt-fw_jump.bin and /dev/null differ diff --git a/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin b/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin new file mode 100644 index 0000000..16c0cf4 Binary files /dev/null and b/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin differ diff --git a/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin b/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin deleted file mode 100644 index 1acee86..0000000 Binary files a/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin and /dev/null differ diff --git a/pc-bios/opensbi-riscv64-virt-fw_jump.bin b/pc-bios/opensbi-riscv64-virt-fw_jump.bin deleted file mode 100644 index c62f2b4..0000000 From patchwork Thu Jul 16 05:56:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11666735 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 974C41392 for ; Thu, 16 Jul 2020 05:58:56 +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 6D9BC2065E for ; Thu, 16 Jul 2020 05:58:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CVZCbEj8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6D9BC2065E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:36626 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvwv1-0001PI-NN for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jul 2020 01:58:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvwsx-0005tu-RB; Thu, 16 Jul 2020 01:56:47 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34563) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvwsw-0000Lq-Ac; Thu, 16 Jul 2020 01:56:47 -0400 Received: by mail-wr1-x444.google.com with SMTP id f7so5718655wrw.1; Wed, 15 Jul 2020 22:56:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v4rIb2CeclCvwojfrkAqQ1sS0w4c9rJ4vZWLayY4XDc=; b=CVZCbEj8q8nNgCkAPO0JJkK4Tk4OrU03tI+1IW2lZLzcZWrM2Yx6R4NOTCUGptCUfJ 7yLYTiXK3psqw/910aOi9KnKHSLKiYjby05ZGEsMC2xHKP/6YZ+XXGNjdghomHgtjWIP Xbf5K2WDhBJ/xzlUoBgemIdAZuFGdKBGUurCh+d40YlVFAlNyPE6illau8HJs57FIIV1 /ju1q3fTiChS8RS275AKg4Li8GuNktAOuT4C2Q5nZ8+lLa8gkVjHvdJ5r28fmtH1wlnz AnP12OY1zyiK+hNY3nKHKgfqjJYWa0N/e4lRLRXkRtfqOrAYTQYeMcywytZqdZWkQpIz jhfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v4rIb2CeclCvwojfrkAqQ1sS0w4c9rJ4vZWLayY4XDc=; b=YaCA8bJobOyLi/CJQmFZI4no579R1DMSUyqe6Usc44+ActOU56QHTKb1dtCfQC9SOW WmbjzyVoo9ECkGV2RS/H85GkewlmXceWqyubdQSAfr7bG2Ypy638JgKuuumjPaIjg6H8 47c2p2TpFVLEB/mkevRuArVEkou3cUtltw9NTsXfrI1e4fWNjBDmAE1s6RkyRd6ZTsEU oz6wnWE0datsyqcEqrgM4JlkS4dyTTeAaGthK29OB4aUrPZPtY0m9SRZmsNECylQ45RH y/qKm9/G8ssTOeQlvYGXI10uuBXki3xJsxJ89SCHei/fkgtrZmfk5F4IO4t0A3mTIVqc e/iw== X-Gm-Message-State: AOAM532X7V1F9d1jPT52GzVQNhH/Pv0xh1PhG5EwhpHJpioYFr8dOtqn uO5tjL/UMNPBD+vHSZh0o6E= X-Google-Smtp-Source: ABdhPJyeRQ89v02DAROIHnm/6tk4X93uhC5ccEsi4dbjE+RUR5yKW+250CwJg7INMxLROKDFTz+OtQ== X-Received: by 2002:a5d:43d2:: with SMTP id v18mr3296268wrr.196.1594879004844; Wed, 15 Jul 2020 22:56:44 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id f12sm7193458wrw.53.2020.07.15.22.56.42 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Jul 2020 22:56:44 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v5 5/7] hw/riscv: spike: Change the default bios to use generic platform image Date: Wed, 15 Jul 2020 22:56:09 -0700 Message-Id: <1594878971-26050-6-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> References: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=bmeng.cn@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Anup Patel , Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng To keep sync with other RISC-V machines, change the default bios to use generic platform fw_dynamic.elf image. While we are here, add some comments to mention that using ELF files for the Spike machine was intentional. Signed-off-by: Bin Meng Reviewed-by: Anup Patel Reviewed-by: Alistair Francis --- (no changes since v3) Changes in v3: - Change to fw_dynamic.elf for Spike hw/riscv/spike.c | 9 +++++++-- pc-bios/opensbi-riscv32-generic-fw_dynamic.elf | Bin 0 -> 558668 bytes pc-bios/opensbi-riscv64-generic-fw_dynamic.elf | Bin 0 -> 620424 bytes 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.elf create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.elf Binary files /dev/null and b/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf differ diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c index 7b23a29..13958bd 100644 --- a/hw/riscv/spike.c +++ b/hw/riscv/spike.c @@ -42,10 +42,15 @@ #include "sysemu/qtest.h" #include "sysemu/sysemu.h" +/* + * Not like other RISC-V machines that use plain binary bios images, + * keeping ELF files here was intentional because BIN files don't work + * for the Spike machine as HTIF emulation depends on ELF parsing. + */ #if defined(TARGET_RISCV32) -# define BIOS_FILENAME "opensbi-riscv32-spike-fw_jump.elf" +# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.elf" #else -# define BIOS_FILENAME "opensbi-riscv64-spike-fw_jump.elf" +# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.elf" #endif static const struct MemmapEntry { diff --git a/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf b/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf new file mode 100644 index 0000000..eb9ebf5 Binary files /dev/null and b/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf differ diff --git a/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf b/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf new file mode 100644 index 0000000..642a64e From patchwork Thu Jul 16 05:56:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11666737 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 56B031392 for ; Thu, 16 Jul 2020 06:00:24 +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 2CA4820578 for ; Thu, 16 Jul 2020 06:00:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="HV1qoyTD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CA4820578 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:40960 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvwwR-00038y-Fn for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jul 2020 02:00:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46776) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvwt0-000603-KI; Thu, 16 Jul 2020 01:56:50 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46978) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvwsy-0000N5-RS; Thu, 16 Jul 2020 01:56:50 -0400 Received: by mail-wr1-x442.google.com with SMTP id r12so5604110wrj.13; Wed, 15 Jul 2020 22:56:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gPk8wbtFKUEMIlCNhLaq8+ecNgu5uEuNf0fX/hiwAcE=; b=HV1qoyTDa3WXH5nhwDmHUogGvOMueJadrDZy9iumjfRVfiULMWhXXafREjptsd9Fz7 5ose19NuT9k6fLQPXLSebCkdT4QdYd7R+T0qnHwXGohS0qtU7E8kSQkRT3GhI5iyvnJg huw++ZA9HC28Y85mq6vC6XHAX9UQyLFaMBF2huBJIArm1BJ2sZloaXyOA29hwx+Bc+At 4ekndD8c1vnnzSFJPsB4ac1rKClVvsD2KbO2bg3YnWJ9lkfHnQLph7SUnYKfunDcJZdH plPqNjz/Y5zQ/pGqgYwSGOnLfRkA4QOxb6GmDxVUEYpDhIR2KfrmKjnZ9nIGJrcqF/nq 0fJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gPk8wbtFKUEMIlCNhLaq8+ecNgu5uEuNf0fX/hiwAcE=; b=mlBtkL/PKB4CrmCcxR2+HSVFSUi9fu2AKaTSr5Fid8keqwhHpTsJ5ES+wEeylAmz1N tRHm+GyI26f/QyBPOR3BMr11VrrvwldjKTeESyoO3bt6mba9hhszqpcaV7rv4YMSeWqE kkaVGfpwlSKJjQ6Ufce09xWzXMsEqV33OCGojFoO0fN3ggYze5uFdnsMWRRnQ6U3nj0E CcaN3Bc2APSBgZjhWJ1V2gJxvjWMQ4Yn8ikLTfyYjoDEF66GkkF20voxrkkD9kOJnVVI hAsLYdXrU0tpRKRPBrzjUsoLKLAiutUu6WBGhL6AB4Nhi2Jn7j930PMQA6MUT2JpcNjD gDfg== X-Gm-Message-State: AOAM531Lnd7rMKHbB5QjPYAFJLb3+0hmEwdDOkRcXin6Ujk3pYmLJ+ZA JoVeFdis95it7ieOq11Lfg8= X-Google-Smtp-Source: ABdhPJyxejengnTpp69BDx2g91p/FZEeKrpqdVQblUp1A/bpD445kpk7jlyBD7mjEGY4r/3iPiTNYg== X-Received: by 2002:a5d:6342:: with SMTP id b2mr3303866wrw.262.1594879007237; Wed, 15 Jul 2020 22:56:47 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id f12sm7193458wrw.53.2020.07.15.22.56.45 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Jul 2020 22:56:46 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v5 6/7] gitlab-ci/opensbi: Update GitLab CI to build generic platform Date: Wed, 15 Jul 2020 22:56:10 -0700 Message-Id: <1594878971-26050-7-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> References: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::442; envelope-from=bmeng.cn@gmail.com; helo=mail-wr1-x442.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Anup Patel , Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng This updates the GitLab CI opensbi job to build opensbi bios images for the generic platform. Signed-off-by: Bin Meng Reviewed-by: Anup Patel Reviewed-by: Alistair Francis --- (no changes since v3) Changes in v3: - Generate fw_dynamic images in the artifacts Changes in v2: - Include ELF images in the artifacts .gitlab-ci.d/opensbi.yml | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml index 62088ec..5b13047 100644 --- a/.gitlab-ci.d/opensbi.yml +++ b/.gitlab-ci.d/opensbi.yml @@ -35,18 +35,14 @@ build-opensbi: when: always artifacts: paths: # 'artifacts.zip' will contains the following files: - - pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin - - pc-bios/opensbi-riscv32-virt-fw_jump.bin - - pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin - - pc-bios/opensbi-riscv64-virt-fw_jump.bin - - opensbi32-virt-stdout.log - - opensbi32-virt-stderr.log - - opensbi64-virt-stdout.log - - opensbi64-virt-stderr.log - - opensbi32-sifive_u-stdout.log - - opensbi32-sifive_u-stderr.log - - opensbi64-sifive_u-stdout.log - - opensbi64-sifive_u-stderr.log + - pc-bios/opensbi-riscv32-generic-fw_dynamic.bin + - pc-bios/opensbi-riscv32-generic-fw_dynamic.elf + - pc-bios/opensbi-riscv64-generic-fw_dynamic.bin + - pc-bios/opensbi-riscv64-generic-fw_dynamic.elf + - opensbi32-generic-stdout.log + - opensbi32-generic-stderr.log + - opensbi64-generic-stdout.log + - opensbi64-generic-stderr.log image: $CI_REGISTRY_IMAGE:opensbi-cross-build variables: GIT_DEPTH: 3 @@ -55,10 +51,6 @@ build-opensbi: - export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1)) - echo "=== Using ${JOBS} simultaneous jobs ===" - make -j${JOBS} -C roms/opensbi clean - - make -j${JOBS} -C roms opensbi32-virt 2>&1 1>opensbi32-virt-stdout.log | tee -a opensbi32-virt-stderr.log >&2 + - make -j${JOBS} -C roms opensbi32-generic 2>&1 1>opensbi32-generic-stdout.log | tee -a opensbi32-generic-stderr.log >&2 - make -j${JOBS} -C roms/opensbi clean - - make -j${JOBS} -C roms opensbi64-virt 2>&1 1>opensbi64-virt-stdout.log | tee -a opensbi64-virt-stderr.log >&2 - - make -j${JOBS} -C roms/opensbi clean - - make -j${JOBS} -C roms opensbi32-sifive_u 2>&1 1>opensbi32-sifive_u-stdout.log | tee -a opensbi32-sifive_u-stderr.log >&2 - - make -j${JOBS} -C roms/opensbi clean - - make -j${JOBS} -C roms opensbi64-sifive_u 2>&1 1>opensbi64-sifive_u-stdout.log | tee -a opensbi64-sifive_u-stderr.log >&2 + - make -j${JOBS} -C roms opensbi64-generic 2>&1 1>opensbi64-generic-stdout.log | tee -a opensbi64-generic-stderr.log >&2 From patchwork Thu Jul 16 05:56:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 11666739 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5782F13B4 for ; Thu, 16 Jul 2020 06:01:53 +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 2B47820578 for ; Thu, 16 Jul 2020 06:01:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="grUecDMg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2B47820578 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:43256 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jvwxs-0004Ei-FW for patchwork-qemu-devel@patchwork.kernel.org; Thu, 16 Jul 2020 02:01:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46788) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jvwt3-00063y-LX; Thu, 16 Jul 2020 01:56:53 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38107) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jvwt1-0000NQ-5C; Thu, 16 Jul 2020 01:56:53 -0400 Received: by mail-wr1-x444.google.com with SMTP id z13so5692702wrw.5; Wed, 15 Jul 2020 22:56:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R3qj7wfb+LJ+KgPGAv0T5wNtaiHsbTmKg4zjBiQ+Yjg=; b=grUecDMgm7QOuvpO/nX578gM9+E/BQEMzL+jdHrAPUl2Jg3EqNkgRZekz54K4VVZ1J Ai2kJi53rHiePacBpTm0F6nlxcT9xMZ3+Q82XcfoT3H9fp202cK9SbhqTksXfRsk0Qh3 CC0RHduLVv0UyPzjS1zIH+GaJUMdtR9Wjuq3P52SjWnCDHucX60LdU7ctWBDaGOuUQNe T9XBO1gCinbHFnNKLrhC/a8obXY0U7iy8D/PG0bBst2S0HHbZdhHQIo9gZ2ZFNs1VNs2 yVBHOnkeZyqL4h5WhJ34hdrSMkljCM9RtvTyWqVRz36YNvgjbE73IwfyEdoPTdV8jPAj aZPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R3qj7wfb+LJ+KgPGAv0T5wNtaiHsbTmKg4zjBiQ+Yjg=; b=OGUM4v0xY7C0IuW8+7mxGm2hX2Z1hllYFXHSS1Oakyr/O1VqtX2dlklOOX2ZxHmtqi NwW+7mO/QhYo1FyvU3GLD0IPAsqN2JKRErT93foZh2JeiAzRvJM6xtcKjR20JiWP3H1d jDqUkix8eYX2XOoxe8knPg9j/W7w1jsbUX/4UzkrS6bI+qf1rJOZLsvuOCpkvWlK2Uhg oJGMetFtcPwKNpJWMvr4w7bT6wQ0AASCV5pgV1A/JkPOuxzl35p0IcVQOEBv1/yaSqOF 0tGLWBkFkQqSDx47+MMo2FJTEYlZtaNMjjlrfixCr3L1J0vryjyOU8X2Xd+D8vS//Tn7 3Zxw== X-Gm-Message-State: AOAM533nylOMMhenQTT1oo+dZeBsrVNZ4ZKPdFS8YJ4nkZsgpyPuJ/vR gOmLiCLKn7DDavs2GsPgfL0= X-Google-Smtp-Source: ABdhPJwl8TUzopxRsoXnSdo+c5lv+FktsGcl4lxuQmru8uECTly/1wh9fALu+RVvej8hHudlsaJ0rA== X-Received: by 2002:adf:b1cf:: with SMTP id r15mr3570710wra.118.1594879009657; Wed, 15 Jul 2020 22:56:49 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id f12sm7193458wrw.53.2020.07.15.22.56.47 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Jul 2020 22:56:49 -0700 (PDT) From: Bin Meng To: Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v5 7/7] Makefile: Ship the generic platform bios ELF images for RISC-V Date: Wed, 15 Jul 2020 22:56:11 -0700 Message-Id: <1594878971-26050-8-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> References: <1594878971-26050-1-git-send-email-bmeng.cn@gmail.com> Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=bmeng.cn@gmail.com; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: Anup Patel , Bin Meng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Bin Meng At present only the generic platform fw_dynamic bios BIN images are included in the 'make install' target for 'virt' and 'sifive_u' machines. This updates the install blob list to include ELF images which are needed by the 'spike' machine. Signed-off-by: Bin Meng --- Changes in v5: - Ship generic fw_dynamic.elf images in the Makefile Changes in v3: - change fw_jump to fw_dynamic in the Makefile Changes in v2: - new patch: Makefile: Ship the generic platform bios images for RISC-V Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a6d6234..142c545 100644 --- a/Makefile +++ b/Makefile @@ -841,7 +841,8 @@ 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 +opensbi-riscv32-generic-fw_dynamic.bin opensbi-riscv64-generic-fw_dynamic.bin \ +opensbi-riscv32-generic-fw_dynamic.elf opensbi-riscv64-generic-fw_dynamic.elf DESCS=50-edk2-i386-secure.json 50-edk2-x86_64-secure.json \