From owner-svn-src-head@freebsd.org Tue Dec 15 15:13:06 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 C99284B914D; Tue, 15 Dec 2020 15:13:06 +0000 (UTC) (envelope-from manu@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 4CwMFt5Bn9z4Sxc; Tue, 15 Dec 2020 15:13:06 +0000 (UTC) (envelope-from manu@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 A56F516195; Tue, 15 Dec 2020 15:13:06 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BFFD6ps000811; Tue, 15 Dec 2020 15:13:06 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BFFD6wG000810; Tue, 15 Dec 2020 15:13:06 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202012151513.0BFFD6wG000810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Tue, 15 Dec 2020 15:13:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r368662 - head/release/arm64 X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/release/arm64 X-SVN-Commit-Revision: 368662 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, 15 Dec 2020 15:13:06 -0000 Author: manu Date: Tue Dec 15 15:13:06 2020 New Revision: 368662 URL: https://svnweb.freebsd.org/changeset/base/368662 Log: release: Rename arm64/RPI3.conf to arm64/RPI.conf We now have a u-boot port and config.txt for booting on all 64bits variant of the RPI boards (RPI2v1.1, RPI3* and RPI4*) so use the new u-boot-rpi-arm64 and the config_arm64.txt files. Discussed with: karels, kevans Added: head/release/arm64/RPI.conf - copied, changed from r368661, head/release/arm64/RPI3.conf Deleted: head/release/arm64/RPI3.conf Copied and modified: head/release/arm64/RPI.conf (from r368661, head/release/arm64/RPI3.conf) ============================================================================== --- head/release/arm64/RPI3.conf Tue Dec 15 14:58:40 2020 (r368661, copy source) +++ head/release/arm64/RPI.conf Tue Dec 15 15:13:06 2020 (r368662) @@ -8,7 +8,7 @@ DTB="bcm2710-rpi-2-b.dtb bcm2710-rpi-3-b.dtb bcm2710-r EMBEDDED_TARGET_ARCH="aarch64" EMBEDDED_TARGET="arm64" EMBEDDEDBUILD=1 -EMBEDDEDPORTS="sysutils/u-boot-rpi3 sysutils/rpi-firmware" +EMBEDDEDPORTS="sysutils/u-boot-rpi-arm64 sysutils/rpi-firmware" FAT_SIZE="50m -b 1m" FAT_TYPE="16" IMAGE_SIZE="3072M" @@ -18,10 +18,10 @@ NODOC=1 OL_DIR="${DTB_DIR}/overlays" OVERLAYS="mmc.dtbo pwm.dtbo disable-bt.dtbo" PART_SCHEME="MBR" -export BOARDNAME="RPI3" +export BOARDNAME="RPI" arm_install_uboot() { - UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi3" + UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi-arm64" UBOOT_FILES="README u-boot.bin" DTB_FILES="armstub8.bin armstub8-gic.bin bootcode.bin fixup_cd.dat \ fixup_db.dat fixup_x.dat fixup.dat LICENCE.broadcom \ @@ -39,9 +39,7 @@ arm_install_uboot() { chroot ${CHROOTDIR} cp -p ${DTB_DIR}/${_DF} \ ${FATMOUNT}/${_DF} done - chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi4.txt \ - ${FATMOUNT} - chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_rpi3.txt \ + chroot ${CHROOTDIR} cp -p ${DTB_DIR}/config_arm64.txt \ ${FATMOUNT}/config.txt chroot ${CHROOTDIR} mkdir -p ${FATMOUNT}/overlays for _OL in ${OVERLAYS}; do