From owner-svn-src-all@freebsd.org  Fri Nov  3 19:32:11 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 3F949E594C1;
 Fri,  3 Nov 2017 19:32:11 +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 0DB477024D;
 Fri,  3 Nov 2017 19:32:10 +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 vA3JWAq1013952;
 Fri, 3 Nov 2017 19:32:10 GMT (envelope-from gjb@FreeBSD.org)
Received: (from gjb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA3JWA3m013951;
 Fri, 3 Nov 2017 19:32:10 GMT (envelope-from gjb@FreeBSD.org)
Message-Id: <201711031932.vA3JWA3m013951@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org
 using -f
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 3 Nov 2017 19:32:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325369 - head/release/arm64
X-SVN-Group: head
X-SVN-Commit-Author: gjb
X-SVN-Commit-Paths: head/release/arm64
X-SVN-Commit-Revision: 325369
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Nov 2017 19:32:11 -0000

Author: gjb
Date: Fri Nov  3 19:32:10 2017
New Revision: 325369
URL: https://svnweb.freebsd.org/changeset/base/325369

Log:
  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

Modified:
  head/release/arm64/PINE64.conf

Modified: head/release/arm64/PINE64.conf
==============================================================================
--- head/release/arm64/PINE64.conf	Fri Nov  3 19:21:36 2017	(r325368)
+++ head/release/arm64/PINE64.conf	Fri Nov  3 19:32:10 2017	(r325369)
@@ -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} \