From d025cec6250eb4e6be6290eca20c75eef4b28020 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 17 Nov 2017 17:34:52 +0000
Subject: [PATCH] Sort variables in arm64 SoC configurations. Remove an
 unneeded UBLDR_LOADADDR from RPI3.conf.

Sponsored by:	The FreeBSD Foundation
---
 release/arm64/PINE64.conf | 10 +++++-----
 release/arm64/RPI3.conf   | 23 +++++++++++------------
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf
index a41dce93f707..e48a4c57bcf7 100644
--- a/release/arm64/PINE64.conf
+++ b/release/arm64/PINE64.conf
@@ -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() {
diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf
index a37fab9bbe84..79753952608c 100644
--- a/release/arm64/RPI3.conf
+++ b/release/arm64/RPI3.conf
@@ -3,21 +3,20 @@
 # $FreeBSD$
 #
 
-EMBEDDEDBUILD=1
-EMBEDDED_TARGET="arm64"
-EMBEDDED_TARGET_ARCH="aarch64"
-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"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
 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"
+FAT_SIZE="50m -b 1m"
+FAT_TYPE="16"
+IMAGE_SIZE="2560M"
+KERNEL="GENERIC"
+MD_ARGS="-x 63 -y 255"
+NODOC=1
 OVERLAYS="mmc.dtbo pi3-disable-bt.dtbo"
+PART_SCHEME="MBR"
 export BOARDNAME="RPI3"
 
 arm_install_uboot() {