From owner-svn-src-head@freebsd.org Tue Dec 8 00:37:12 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 500BE4BB5E5; Tue, 8 Dec 2020 00:37:12 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cqh8S1r77z4Xmv; Tue, 8 Dec 2020 00:37:12 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31D742C6F; Tue, 8 Dec 2020 00:37:12 +0000 (UTC) (envelope-from mhorne@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B80bC90010062; Tue, 8 Dec 2020 00:37:12 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B80bBfk010060; Tue, 8 Dec 2020 00:37:11 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202012080037.0B80bBfk010060@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mhorne set sender to mhorne@FreeBSD.org using -f From: Mitchell Horne Date: Tue, 8 Dec 2020 00:37:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368422 - in head: release/tools tools/boot X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: in head: release/tools tools/boot X-SVN-Commit-Revision: 368422 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2020 00:37:12 -0000 Author: mhorne Date: Tue Dec 8 00:37:11 2020 New Revision: 368422 URL: https://svnweb.freebsd.org/changeset/base/368422 Log: riscv: allow building virtual machine images RISC-V has the same booting requirements as arm64 (loader.efi, no legacy boot options), so generated images for both architectures have the same partition layout. Reviewed by: gjb Differential Revision: https://reviews.freebsd.org/D27044 Modified: head/release/tools/vmimage.subr head/tools/boot/install-boot.sh Modified: head/release/tools/vmimage.subr ============================================================================== --- head/release/tools/vmimage.subr Tue Dec 8 00:35:13 2020 (r368421) +++ head/release/tools/vmimage.subr Tue Dec 8 00:37:11 2020 (r368422) @@ -30,7 +30,7 @@ write_partition_layout() { -p freebsd-boot/bootfs:=${BOOTFILES}/i386/gptboot/gptboot" ROOTFSPART="-p freebsd-ufs/rootfs:=${VMBASE}" ;; - arm64:aarch64) + arm64:aarch64 | riscv:riscv64*) ESP=yes SCHEME=gpt BOOTPARTS= Modified: head/tools/boot/install-boot.sh ============================================================================== --- head/tools/boot/install-boot.sh Tue Dec 8 00:35:13 2020 (r368421) +++ head/tools/boot/install-boot.sh Tue Dec 8 00:37:11 2020 (r368422) @@ -38,6 +38,7 @@ get_uefi_bootname() { arm64) echo bootaa64 ;; i386) echo bootia32 ;; arm) echo bootarm ;; + riscv) echo bootriscv64 ;; *) die "machine type $(uname -m) doesn't support UEFI" ;; esac }