From 91fcd6f57c09a3ce87c0d12be35bb57cd27c2921 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 3 Nov 2017 19:32:10 +0000
Subject: Fix an error in the PINE64.conf, where the ubldr is not needed and
 the u-boot needs to be written to the partition with dd(1).

Reported by:	manu
Sponsored by:	The FreeBSD Foundation
---
 release/arm64/PINE64.conf | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/release/arm64/PINE64.conf b/release/arm64/PINE64.conf
index cf35fd0dc192..cca7e0d000a2 100644
--- a/release/arm64/PINE64.conf
+++ b/release/arm64/PINE64.conf
@@ -9,7 +9,6 @@ EMBEDDED_TARGET="arm64"
 EMBEDDED_TARGET_ARCH="aarch64"
 EMBEDDEDPORTS="sysutils/u-boot-pine64"
 KERNEL="GENERIC"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="2560M"
 PART_SCHEME="MBR"
 FAT_SIZE="54m -b 1m"
@@ -20,16 +19,14 @@ export BOARDNAME="PINE64"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pine64"
-	UBOOT_FILES="u-boot-sunxi-with-spl.bin README"
+	UBOOT_FILES="u-boot-sunxi-with-spl.bin"
 	FATMOUNT="${DESTDIR%${KERNEL}}fat"
 	UFSMOUNT="${DESTDIR%${KERNEL}}ufs"
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+		of=/dev/${mddev} bs=1k seek=8 conv=sync
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	for _UF in ${UBOOT_FILES}; do
-		chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/${_UF} \
-			${FATMOUNT}/${_UF}
-	done
 
 	BOOTFILES="$(chroot ${CHROOTDIR} \
 	    env TARGET=${EMBEDDED_TARGET} TARGET_ARCH=${EMBEDDED_TARGET_ARCH} \
-- 
cgit v1.2.3