From owner-svn-src-all@freebsd.org Tue Dec 8 00:35:13 2020 Return-Path: Delivered-To: svn-src-all@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 D945F4BB452; Tue, 8 Dec 2020 00:35:13 +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 4Cqh695npnz4XQk; Tue, 8 Dec 2020 00:35:13 +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 B55212FB5; Tue, 8 Dec 2020 00:35:13 +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 0B80ZDoc009934; Tue, 8 Dec 2020 00:35:13 GMT (envelope-from mhorne@FreeBSD.org) Received: (from mhorne@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B80ZDIr009933; Tue, 8 Dec 2020 00:35:13 GMT (envelope-from mhorne@FreeBSD.org) Message-Id: <202012080035.0B80ZDIr009933@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:35:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368421 - in head/release: . tools X-SVN-Group: head X-SVN-Commit-Author: mhorne X-SVN-Commit-Paths: in head/release: . tools X-SVN-Commit-Revision: 368421 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2020 00:35:13 -0000 Author: mhorne Date: Tue Dec 8 00:35:13 2020 New Revision: 368421 URL: https://svnweb.freebsd.org/changeset/base/368421 Log: 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 Modified: head/release/release.sh head/release/tools/arm.subr Modified: head/release/release.sh ============================================================================== --- head/release/release.sh Tue Dec 8 00:05:43 2020 (r368420) +++ head/release/release.sh Tue Dec 8 00:35:13 2020 (r368421) @@ -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 Modified: head/release/tools/arm.subr ============================================================================== --- head/release/tools/arm.subr Tue Dec 8 00:05:43 2020 (r368420) +++ head/release/tools/arm.subr Tue Dec 8 00:35:13 2020 (r368421) @@ -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. }