From 86635d499298956e08e9ac8edc4bd8cdfa5e4587 Mon Sep 17 00:00:00 2001
From: Mitchell Horne <mhorne@FreeBSD.org>
Date: Tue, 8 Dec 2020 00:35:13 +0000
Subject: [PATCH] release.sh: add support for RISC-V embedded builds

Since the few existing RISC-V hardware platforms are single board
computers, we can piggyback off of arm/arm64's embedded build support
for generating SD card images.

I don't see a pressing need to change the naming in this file at this
time.

Reviewed by:	gjb, manu
Differential Revision:	https://reviews.freebsd.org/D27043
---
 release/release.sh     | 7 +++++--
 release/tools/arm.subr | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/release/release.sh b/release/release.sh
index 6e76b0cb37d..2ed76fa31c6 100755
--- a/release/release.sh
+++ b/release/release.sh
@@ -144,7 +144,7 @@ env_check() {
 		WITH_COMPRESSED_IMAGES=
 		NODOC=yes
 		case ${EMBEDDED_TARGET}:${EMBEDDED_TARGET_ARCH} in
-			arm:arm*|arm64:aarch64)
+			arm:arm*|arm64:aarch64|riscv:riscv64*)
 				chroot_build_release_cmd="chroot_arm_build_release"
 				;;
 			*)
@@ -400,6 +400,9 @@ efi_boot_name()
 		amd64)
 			echo "bootx64.efi"
 			;;
+		riscv)
+			echo "bootriscv64.efi"
+			;;
 	esac
 }
 
@@ -407,7 +410,7 @@ efi_boot_name()
 chroot_arm_build_release() {
 	load_target_env
 	case ${EMBEDDED_TARGET} in
-		arm|arm64)
+		arm|arm64|riscv)
 			if [ -e "${RELENGDIR}/tools/arm.subr" ]; then
 				. "${RELENGDIR}/tools/arm.subr"
 			fi
diff --git a/release/tools/arm.subr b/release/tools/arm.subr
index 1d4d195ca24..1d4ae17d385 100644
--- a/release/tools/arm.subr
+++ b/release/tools/arm.subr
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# Common subroutines used to build arm SD card images.
+# Common subroutines used to build arm, arm64, or RISC-V SD card images.
 #
 # $FreeBSD$
 #
@@ -265,11 +265,11 @@ arm_install_boot() {
 }
 
 arm_install_uboot() {
-	# Override in the arm/KERNEL.conf file.
+	# Override in the ${EMBEDDED_TARGET}/${BOARDNAME}.conf file.
 
 	return 0
 }
 
 arm_do_quirk() {
-	# Override in the arm{,64}/BOARD.conf file.
+	# Override in the ${EMBEDDED_TARGET}/${BOARDNAME}.conf file.
 }