From 514fd0b8d3b8a72a9b0aaf7a534fc974161d8dfa Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 23 Jun 2017 00:27:40 +0000
Subject: [PATCH] Fix, for the fourth or fifth time now, looking up where
 boot1.efi is located.

MFC after:	5 days
X-MFC-Note:	maybe
X-MFC-With:	r320252, r320253
Sponsored by:	The FreeBSD Foundation
---
 release/arm64/RPI3.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/arm64/RPI3.conf b/release/arm64/RPI3.conf
index b97eeb970fce..aa881d39fc53 100644
--- a/release/arm64/RPI3.conf
+++ b/release/arm64/RPI3.conf
@@ -45,8 +45,8 @@ arm_install_uboot() {
 
 	_OBJDIR="$(chroot ${CHROOTDIR} make -C ${WORLDDIR} -V .OBJDIR)"
 	_OBJDIR="$(realpath ${_OBJDIR})"
-	if [ -d "${CHROOTDIR}/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}" ]; then
-		BOOTFILES="/${_OBJDIR%%/usr/src}/${TARGET}.${TARGET_ARCH}/usr/src/sys/boot"
+	if [ -d "${CHROOTDIR}/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}" ]; then
+		BOOTFILES="/${_OBJDIR%%/usr/src}/${EMBEDDED_TARGET}.${EMBEDDED_TARGET_ARCH}/usr/src/sys/boot"
 	else
 		BOOTFILES="/${_OBJDIR}/sys/boot"
 	fi