svn commit: r325949 - head/release/arm64

[Glen Barber]

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() {