From patchwork Fri Jun 26 01:26:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1317497 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=z3X8DpvT; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=dLE7dA02; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49tXBl4G7qz9sRR for ; Fri, 26 Jun 2020 19:48:30 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=wV6Kifigp8tJuFfu0KqgMJL059nb/s40wn1Dj4MvK14=; b=z3X8DpvTVu5uIJ6yjgiJrbSSG5 1SeCwNVQJcccOjNzGhLO8r3/yege0+ok73uJnt7B2gw+EvS9nrnRk4pjVVMmS9G9bYqkuKw+ZXl+U RJq5ySeew9QmzwGfEPHatRvYrvllpn/nL1xeEO73zRieMaeUJ5nPHPkQga0rUOCFIyq+6w5EuaPTc dPMMVkVWG7F5jKEocz3aCOHRERap+R+9YHCrSWojklD0+j7LXZfBMh/gjfurOADLR1Q0Xz0ha0Zg6 xAPilDnHd0hVv/ayY5I/vsvs4DKMiNhzetgnQKw22z8XfHmhKMmv0y0R8WlYai3FYSJryloURtUIK 0wkendBg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1joky8-000260-4m; Fri, 26 Jun 2020 09:48:24 +0000 Received: from mail-oi1-x244.google.com ([2607:f8b0:4864:20::244]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jojdZ-00071H-In for opensbi@lists.infradead.org; Fri, 26 Jun 2020 08:23:28 +0000 Received: by mail-oi1-x244.google.com with SMTP id j11so4715762oiw.12 for ; Fri, 26 Jun 2020 01:23:03 -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=MYb9eqbxL6yeAGcxRjEsWxj2fpFOeo3QpFnhuWozUlM=; b=dLE7dA02faJnq1LOIuWtV+/ZDh0YxVFjNaRA6Nwl0QMB5M57auZ3BoS89pFp9n5WBY kQNmUaZz6AlOFCsgi+tCpFLX5TIAERFDiwrDC7+ebuHsNYQ0kUkFInRzV/0w/aOWyMs8 dKYszbaqLkgn9YRj1PFVsimpJb/GaZ2CZANqjba/mU6i3GRKjoz6jU22KHBN9Su56D+1 CTMOm7LzKF9hoxYEP88BRqKrGqpf8zPYGP5ITWeQ94m4TqLZLn7EWQai5J7vRVf+UI7f kII2DL1ueFHwrE7oJK7TERPCzafa1Jrk74Ce8PO72RChtj4eusmxYGIUQG8bm1of+hFU X4Rg== 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=MYb9eqbxL6yeAGcxRjEsWxj2fpFOeo3QpFnhuWozUlM=; b=a1QRaLhBNPXl6RKjnuZ+xqjoQIYrGeKg9FIl5LAPI+qT/FRWWdRAYPU0Jk6b7BJJKh +/s09TQglcItpvmqlNzuXDqKVvUOLJ2XMOm1GOe0kxm//Tk/OiT5fLghBakwiOLTFv4V BGKTpJTs9oBucyZYUZo5egJR6zVvicR3h6pqTf7ywVJtQSUQDchdnj9IMBKCzvQJv9c5 ERCTau9pEAkmmEI1QIn+n9MiLLfyJS42shh7tmiOk59aSV529LeXwMfZi1nv5r8LSH4T ZyyZfSWQIhv4wdrpFrjtHsEAmF31bRu9Y9tNN/z/WkgwJNjLTdItTN1gKTkfR0hfl5q9 2YoA== X-Gm-Message-State: AOAM53205OHYg7Lxetdz3GJVrT5iv+DNk7SbivgsR/xH0CaqBFqy/yHR ynNT9LZDl4Iw7yL1CnlklzMh3HsP X-Google-Smtp-Source: ABdhPJye2jlFN8NL/hgpnyDTdP4vFyAbQlkrqHxQqSXjB2WPzTdp3MnFokyTXVvVM1J2Ulqdc6ePOQ== X-Received: by 2002:a17:90a:d0c1:: with SMTP id y1mr794735pjw.164.1593134777864; Thu, 25 Jun 2020 18:26:17 -0700 (PDT) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id a12sm24490964pfr.44.2020.06.25.18.26.17 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 25 Jun 2020 18:26:17 -0700 (PDT) From: Bin Meng To: Atish Patra , opensbi@lists.infradead.org Subject: [PATCH v2 2/3] config.mk: Update QEMU run command for generic and sifive fu540 platforms Date: Thu, 25 Jun 2020 18:26:03 -0700 Message-Id: <1593134764-16743-2-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1593134764-16743-1-git-send-email-bmeng.cn@gmail.com> References: <1593134764-16743-1-git-send-email-bmeng.cn@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:244 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [bmeng.cn[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: opensbi@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bin Meng MIME-Version: 1.0 Sender: "opensbi" Errors-To: opensbi-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Bin Meng Since QEMU v5.1, if there is no "-bios" option provided, the default OpenSBI firmware will be loaded by QEMU as the BIOS automatically, hence to load fw_payload type image, we should explicitly pass the "-bios" option to QEMU. Signed-off-by: Bin Meng Reviewed-by: Atish Patra --- (no changes since v1) platform/generic/config.mk | 2 +- platform/sifive/fu540/config.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/generic/config.mk b/platform/generic/config.mk index 8d63ece..8151974 100644 --- a/platform/generic/config.mk +++ b/platform/generic/config.mk @@ -15,7 +15,7 @@ platform-ldflags-y = # Command for platform specific "make run" platform-runcmd = qemu-system-riscv$(PLATFORM_RISCV_XLEN) -M virt -m 256M \ - -nographic -kernel $(build_dir)/platform/generic/firmware/fw_payload.elf + -nographic -bios $(build_dir)/platform/generic/firmware/fw_payload.elf # Blobs to build FW_TEXT_START=0x80000000 diff --git a/platform/sifive/fu540/config.mk b/platform/sifive/fu540/config.mk index e76adcd..23169b1 100644 --- a/platform/sifive/fu540/config.mk +++ b/platform/sifive/fu540/config.mk @@ -15,7 +15,7 @@ platform-ldflags-y = # Command for platform specific "make run" platform-runcmd = qemu-system-riscv$(PLATFORM_RISCV_XLEN) -M sifive_u -m 256M \ - -nographic -kernel $(build_dir)/platform/sifive/fu540/firmware/fw_payload.elf + -nographic -bios $(build_dir)/platform/sifive/fu540/firmware/fw_payload.elf # Blobs to build FW_TEXT_START=0x80000000