From patchwork Mon Feb 24 13:39:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 1243093 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ckWq3KdD; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 48R3Cr0F3Yz9sRQ for ; Tue, 25 Feb 2020 00:42:48 +1100 (AEDT) Received: from localhost ([::1]:36590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6E0T-0005Nk-Vm for incoming@patchwork.ozlabs.org; Mon, 24 Feb 2020 08:42:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42454) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6DyS-0002nM-DK for qemu-devel@nongnu.org; Mon, 24 Feb 2020 08:40:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6DyP-0004TZ-JI for qemu-devel@nongnu.org; Mon, 24 Feb 2020 08:40:40 -0500 Received: from mail-pj1-x1042.google.com ([2607:f8b0:4864:20::1042]:33623) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j6DyP-0004TG-Do; Mon, 24 Feb 2020 08:40:37 -0500 Received: by mail-pj1-x1042.google.com with SMTP id m7so4071350pjs.0; Mon, 24 Feb 2020 05:40:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=0/dsNfBErGQgUb5GnJfxH0GJkQTyrJ4NoW7A4yewg6g=; b=ckWq3KdDKS2yx5758nFHTBj5kRJjfm0RIHTxLyNZgtZ7br2uq7KE6fqMe78zMvPDJF kJIf7KZbqp9W7ntE0PxgQ6ELC2UyxnXaa8c/y2Jln/7RDabNkUfY1Ejq+iZo7ltoUifE DUiBtl07Uy/M54xhQRPGzWTuV/1r15vEujk6cjLLwel4jAxk/DnDBP4Jf8DxRaJvv2Sh IcZNnmBW6DneQLOGOlEgKR1b9yOnPD8VUbnxoTMJwBSKUOqea5zRmdH0p8K5Ca5iTRkm xmj9y4EhUoGRX5NxszrAkn0PwAFnG6P5rl5DS6L1gcffqKtr7RW+pbFO0h2BLaD+Ux9d kfqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=0/dsNfBErGQgUb5GnJfxH0GJkQTyrJ4NoW7A4yewg6g=; b=eiQEwmpo2fbpTbkcac05v+fxOIYjruG3zS3UtXJghXLMLrul60qKSj0Z8K8XjVuESx 7m0ptWfeb751YNOX3d+9mG70I3xIXD5vl2AuBD7j4Pt83ptJsoIpNhiDhgxiNl25bo0b gxMHxkNszBi0b7644qUbKf+E/1K64ml8S2EFXaf0y5aB7ZhztLV5C0jTNbl7l+yeTnQW wo/vXJJ0ouOLOoq//E0teZUiAmRHj1WxlanG+lKARVTa3ys39xqZQFMhNJ93HsS0w/Sv vz1TVfDyoBxIuELe4HN6L2dke0Bf0h4q4GSv5elbQbGXX3HYoyCPf3tDB/jRi4Nig8aN r7Ng== X-Gm-Message-State: APjAAAWNi5JRpLAeFKqgkpAeTxgGAZUMSUfOjmOiIQHMRzo3sgTl2kn6 cwGZFg7ydvxLOWLpN0Cn8Uo= X-Google-Smtp-Source: APXvYqxEz9iZy1CGRvZjO0zjmzU93w4crU8QeJlQEarnJqlV8qVCZQyA4z15ykynvnZ2aV9ye1T9mg== X-Received: by 2002:a17:902:b714:: with SMTP id d20mr48438255pls.272.1582551636616; Mon, 24 Feb 2020 05:40:36 -0800 (PST) Received: from localhost.localdomain (unknown-224-80.windriver.com. [147.11.224.80]) by smtp.gmail.com with ESMTPSA id p4sm12912258pgh.14.2020.02.24.05.40.35 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 24 Feb 2020 05:40:36 -0800 (PST) From: Bin Meng To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Alistair Francis , Bastian Koppelmann , Palmer Dabbelt , Sagar Karandikar , qemu-devel@nongnu.org, qemu-riscv@nongnu.org Subject: [PATCH v2 3/4] riscv: sifive_u: Update BIOS_FILENAME for 32-bit Date: Mon, 24 Feb 2020 05:39:43 -0800 Message-Id: <1582551584-20093-4-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1582551584-20093-1-git-send-email-bmeng.cn@gmail.com> References: <1582551584-20093-1-git-send-email-bmeng.cn@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::1042 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: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Update BIOS_FILENAME to consider 32-bit bios image file name. Tested booting Linux v5.5 32-bit image (built from rv32_defconfig plus CONFIG_SOC_SIFIVE) with the default 32-bit bios image. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis --- Changes in v2: None hw/riscv/sifive_u.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c index ca561d3..371133e 100644 --- a/hw/riscv/sifive_u.c +++ b/hw/riscv/sifive_u.c @@ -57,7 +57,11 @@ #include -#define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin" +#if defined(TARGET_RISCV32) +# define BIOS_FILENAME "opensbi-riscv32-sifive_u-fw_jump.bin" +#else +# define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin" +#endif static const struct MemmapEntry { hwaddr base;