From d46a2a0013e1b0293d5c25c487f76a22b681072f Mon Sep 17 00:00:00 2001
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Tue, 8 Dec 2020 00:37:11 +0000
Subject: [PATCH] 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
---
 release/tools/vmimage.subr | 2 +-
 tools/boot/install-boot.sh | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index bec191e9f55d..7bad725c9870 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -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=
diff --git a/tools/boot/install-boot.sh b/tools/boot/install-boot.sh
index 58ffb6987bb7..ce6e363a3067 100755
--- a/tools/boot/install-boot.sh
+++ b/tools/boot/install-boot.sh
@@ -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
 }