From patchwork Mon Mar 18 22:44:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 1058130 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=wdc.com header.i=@wdc.com header.b="bPoezMo2"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="FXP8/cR4"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44NWT33GM6z9s6w for ; Tue, 19 Mar 2019 09:44:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 5829287248; Mon, 18 Mar 2019 22:44:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id c3eog5YE4Xny; Mon, 18 Mar 2019 22:44:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 862498723D; Mon, 18 Mar 2019 22:44:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 10FF91BF287 for ; Mon, 18 Mar 2019 22:44:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0E10225F62 for ; Mon, 18 Mar 2019 22:44:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gU2f9mssYGEo for ; Mon, 18 Mar 2019 22:44:10 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from esa5.hgst.iphmx.com (esa5.hgst.iphmx.com [216.71.153.144]) by silver.osuosl.org (Postfix) with ESMTPS id 6A5AF25D10 for ; Mon, 18 Mar 2019 22:44:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1552949051; x=1584485051; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=FQ5xmuzwixkeUyeH0lzkH6vwmWoJjuWdecMTjoUy3xk=; b=bPoezMo2dn8Q/pMj2meBoJITNziN2+Wj27yPJaDgkMx3bF9G+luYhs4M 5kwOV0gZlDRrLZP6Fj7oaOJlnuRKSPJ4aljazdcD/B83G7UX4Y1RLfRdp LWF517lPSxE5ojl5/hlXu6D8fz2DFTs+VKiQzBoeaENzWeX3I2aTGLrrM 8/otQ24JFk/7CTtTR0twlBSpHYwdNg7RqN2gE4md4knIW3IMdr3G2JPEs pgXTv+G6YLN2JSZv0Rfjs3HnL+c3qiBtksjYyzLhQrOxECDJ25/HUbXrG K2hq4ezQiXWsaoznAJlEe62eXXeK05OHlMPaGM4q3XjmnS2XV91ezHedL A==; X-IronPort-AV: E=Sophos;i="5.58,495,1544457600"; d="scan'208";a="105039376" Received: from mail-sn1nam02lp2052.outbound.protection.outlook.com (HELO NAM02-SN1-obe.outbound.protection.outlook.com) ([104.47.36.52]) by ob1.hgst.iphmx.com with ESMTP; 19 Mar 2019 06:44:11 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OgGu+zp04nl6MI9UCQ1dfc78xMtHikwfz31bJ+6UTQI=; b=FXP8/cR4Vm2U471NlJ7ej7fMmDwB50qUBmPz8d4PI8VBltxP+2PKExBxooGkZuzVVeAUNLP9PIqii/FJaPs69ZYGdhNtyNOJnZ5LDlr6yWrhCIB5o3yttOtFHbVhnYZ8zXWx04EhUdrbEKRTiuhRv32nprKqUN14IPIsUq0lfko= Received: from BYAPR04MB4901.namprd04.prod.outlook.com (52.135.232.206) by BYAPR04MB5879.namprd04.prod.outlook.com (20.179.59.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1709.13; Mon, 18 Mar 2019 22:44:09 +0000 Received: from BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7]) by BYAPR04MB4901.namprd04.prod.outlook.com ([fe80::1c45:32d7:98ed:4cd7%6]) with mapi id 15.20.1709.015; Mon, 18 Mar 2019 22:44:09 +0000 From: Alistair Francis To: "mark.corbin@embecosm.com" , "buildroot@buildroot.org" Thread-Topic: [PATCH v3 3/3] configs: qemu_riscv*_virt: Use OpenSBI by default Thread-Index: AQHU3dwZhMTv5Hx/gEeV4y9T0BT4YA== Date: Mon, 18 Mar 2019 22:44:08 +0000 Message-ID: <20190318224309.11805-3-alistair.francis@wdc.com> References: <20190318224309.11805-1-alistair.francis@wdc.com> In-Reply-To: <20190318224309.11805-1-alistair.francis@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.21.0 x-clientproxiedby: BYAPR07CA0027.namprd07.prod.outlook.com (2603:10b6:a02:bc::40) To BYAPR04MB4901.namprd04.prod.outlook.com (2603:10b6:a03:4f::14) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alistair.Francis@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [199.255.45.64] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9a32c1cc-38d4-46fc-2948-08d6abf33bbd x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600127)(711020)(4605104)(4618075)(2017052603328)(7153060)(7193020); SRVR:BYAPR04MB5879; x-ms-traffictypediagnostic: BYAPR04MB5879: x-ms-exchange-purlcount: 1 wdcipoutbound: EOP-TRUE x-microsoft-antispam-prvs: x-forefront-prvs: 098076C36C x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(376002)(366004)(136003)(346002)(39860400002)(189003)(199004)(6506007)(71190400001)(71200400001)(476003)(99286004)(2906002)(102836004)(8936002)(316002)(50226002)(54906003)(52116002)(3846002)(68736007)(6116002)(486006)(76176011)(66066001)(44832011)(386003)(110136005)(105586002)(305945005)(6436002)(81156014)(81166006)(1076003)(7736002)(6486002)(8676002)(256004)(4326008)(11346002)(186003)(478600001)(72206003)(2616005)(446003)(5660300002)(26005)(53936002)(97736004)(25786009)(6512007)(36756003)(6306002)(106356001)(2501003)(86362001)(14454004); DIR:OUT; SFP:1102; SCL:1; SRVR:BYAPR04MB5879; H:BYAPR04MB4901.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: 3eRqAslQbgNU9esnLFnidV9JJi+3XfwrMJWMbaptmNrJDVwBUDy1tqwY4/fw6ZNuuzIZy81gX+3hnlnzvuHI8SZnglH57KMSUIvC79lZkg+ay6y2vLgFO8CLVAsyHzt1aoAqqR8YKOtcBwelhrFQ0+aD7cJpRlqpgi8QRO1LdFcaC5OoMz9QDetmiAErNFmVW08UELAunYsa8y3OYi/2dnLM+6Q3x6oVdfrmmnbU0aFdvCG6VyTWG7OCFI3FLPaaC1pW4pJ/ks8MtlU2ovkRyV5KYGmRZCuF2y86wBFceXucdvHQstHzq2yZbAnX9KgXPCbPuaURlII1pvaCdFmHIfX6BvwXrCGI/sb83HH690Ig6zR/tg1YsuuTftvYBgxF6YL8b834svIkz6VF58A2mWtRM52aRl2sHTvxK3kJAtA= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a32c1cc-38d4-46fc-2948-08d6abf33bbd X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Mar 2019 22:44:08.9851 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR04MB5879 Subject: [Buildroot] [PATCH v3 3/3] configs: qemu_riscv*_virt: Use OpenSBI by default X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Atish Patra , Alistair Francis , "alistair23@gmail.com" Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Use OpenSBI by default instead of riscv-pk (BBL). Signed-off-by: Alistair Francis --- board/qemu/riscv32-virt/readme.txt | 6 +++--- board/qemu/riscv64-virt/readme.txt | 6 +++--- configs/qemu_riscv32_virt_defconfig | 5 ++++- configs/qemu_riscv64_virt_defconfig | 5 ++++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/board/qemu/riscv32-virt/readme.txt b/board/qemu/riscv32-virt/readme.txt index 2da99580e5..fb441723fd 100644 --- a/board/qemu/riscv32-virt/readme.txt +++ b/board/qemu/riscv32-virt/readme.txt @@ -1,7 +1,7 @@ -Run the emulation with: +Run Linux in emulation with: - qemu-system-riscv32 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + qemu-system-riscv32 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80400000 -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.12.1 +Tested with QEMU 3.1 diff --git a/board/qemu/riscv64-virt/readme.txt b/board/qemu/riscv64-virt/readme.txt index 9f6e35c867..0af27f7bf2 100644 --- a/board/qemu/riscv64-virt/readme.txt +++ b/board/qemu/riscv64-virt/readme.txt @@ -1,7 +1,7 @@ -Run the emulation with: +Run Linux in emulation with: - qemu-system-riscv64 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + qemu-system-riscv64 -M virt -kernel output/images/fw_jump.elf -device loader,file=output/images/Image,addr=0x80200000 -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic The login prompt will appear in the terminal that started Qemu. -Tested with QEMU 2.12.1 +Tested with QEMU 3.1 diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index 6f9a61b11c..96d971333a 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -20,6 +20,9 @@ BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config" +BR2_LINUX_KERNEL_IMAGE=y # Bootloader -BR2_TARGET_RISCV_PK=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_USE_PLAT=y +BR2_TARGET_OPENSBI_PLAT="qemu/virt" diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 596edf2fcd..05d2764003 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -19,6 +19,9 @@ BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_IMAGE=y # Bootloader -BR2_TARGET_RISCV_PK=y +BR2_TARGET_OPENSBI=y +BR2_TARGET_OPENSBI_USE_PLAT=y +BR2_TARGET_OPENSBI_PLAT="qemu/virt"