From owner-svn-src-head@freebsd.org Fri Nov 17 17:34:54 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 337FFDDF4ED; Fri, 17 Nov 2017 17:34:54 +0000 (UTC) (envelope-from gjb@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 mx1.freebsd.org (Postfix) with ESMTPS id 000D66E816; Fri, 17 Nov 2017 17:34:53 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vAHHYriA028869; Fri, 17 Nov 2017 17:34:53 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAHHYq9i028867; Fri, 17 Nov 2017 17:34:52 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <201711171734.vAHHYq9i028867@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 17 Nov 2017 17:34:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r325949 - head/release/arm64 X-SVN-Group: head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/release/arm64 X-SVN-Commit-Revision: 325949 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.25 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: Fri, 17 Nov 2017 17:34:54 -0000 Author: gjb Date: Fri Nov 17 17:34:52 2017 New Revision: 325949 URL: https://svnweb.freebsd.org/changeset/base/325949 Log: Sort variables in arm64 SoC configurations. Remove an unneeded UBLDR_LOADADDR from RPI3.conf. Sponsored by: The FreeBSD Foundation Modified: head/release/arm64/PINE64.conf head/release/arm64/RPI3.conf Modified: head/release/arm64/PINE64.conf ============================================================================== --- head/release/arm64/PINE64.conf Fri Nov 17 17:33:06 2017 (r325948) +++ head/release/arm64/PINE64.conf Fri Nov 17 17:34:52 2017 (r325949) @@ -3,17 +3,17 @@ # $FreeBSD$ # -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm64" EMBEDDED_TARGET_ARCH="aarch64" +EMBEDDED_TARGET="arm64" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-pine64" -KERNEL="GENERIC" -IMAGE_SIZE="2560M" -PART_SCHEME="MBR" FAT_SIZE="54m -b 1m" FAT_TYPE="16" +IMAGE_SIZE="2560M" +KERNEL="GENERIC" MD_ARGS="-x 16384 -y 255" NODOC=1 +PART_SCHEME="MBR" export BOARDNAME="PINE64" arm_install_uboot() { Modified: head/release/arm64/RPI3.conf ============================================================================== --- head/release/arm64/RPI3.conf Fri Nov 17 17:33:06 2017 (r325948) +++ head/release/arm64/RPI3.conf Fri Nov 17 17:34:52 2017 (r325949) @@ -3,21 +3,20 @@ # $FreeBSD$ # -EMBEDDEDBUILD=1 -EMBEDDED_TARGET="arm64" +DTB_REPO="https://github.com/raspberrypi/firmware/blob/master/boot" +DTB="bcm2710-rpi-3-b.dtb" EMBEDDED_TARGET_ARCH="aarch64" +EMBEDDED_TARGET="arm64" +EMBEDDEDBUILD=1 EMBEDDEDPORTS="sysutils/u-boot-rpi3 security/ca_root_nss" -KERNEL="GENERIC" -WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000" -IMAGE_SIZE="2560M" -PART_SCHEME="MBR" FAT_SIZE="50m -b 1m" FAT_TYPE="16" +IMAGE_SIZE="2560M" +KERNEL="GENERIC" MD_ARGS="-x 63 -y 255" NODOC=1 -DTB_REPO="https://github.com/raspberrypi/firmware/blob/master/boot" -DTB="bcm2710-rpi-3-b.dtb" OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo" +PART_SCHEME="MBR" export BOARDNAME="RPI3" arm_install_uboot() {