From ace79aa796cb7c00aa4de41eaab41d49bb9aa019 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Tue, 5 May 2015 21:08:50 +0000
Subject: Fix building BEAGLEBONE images with Crochet using the
 sysutils/u-boot-beaglebone port:

 - In arm/BEAGLEBONE.conf, set EMBEDDEDPORTS to the
   sysutils/u-boot-beaglebone port.
 - In arm/release.sh, remove BEAGLEBONE from setting WANT_UBOOT
 - In tools/arm/crochet-BEAGLEBONE.conf, override the
   beaglebone_check_uboot(), and set BEAGLEBONE_UBOOT to
   /tmp/external/u-boot-beaglebone, and create symlinks to the
   u-boot files in /usr/local/share/u-boot-beaglebone and the
   uEnv.txt file in crochet/board/Beaglebone/files.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf               |  1 +
 release/arm/release.sh                    |  5 -----
 release/tools/arm/crochet-BEAGLEBONE.conf | 11 +++++++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'release')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 4efb61d20bec..72337f831cc3 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -13,6 +13,7 @@ export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
 export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
 export CHROOTDIR="/scratch"
 export EMBEDDEDBUILD=1
+export EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
 
 # Build chroot configuration
 load_chroot_env() {
diff --git a/release/arm/release.sh b/release/arm/release.sh
index 104edd8cb32d..c68f812c7043 100755
--- a/release/arm/release.sh
+++ b/release/arm/release.sh
@@ -42,11 +42,6 @@ before_build() {
 	KNOWNHASH=
 	UBOOT_VERSION=
 	case ${KERNEL} in
-		BEAGLEBONE)
-			WANT_UBOOT=1
-			KNOWNHASH="7b6444bd23eb61068c43bd1d44ec7e7bfdbce5cadeca20c833eee186b4d3fd31"
-			UBOOT_VERSION="u-boot-2014.04"
-			;;
 		PANDABOARD)
 			WANT_UBOOT=1
 			KNOWNHASH="e08e20a6979bfca6eebb9a2b0e42aa4416af3d796332fd63a3470495a089d496"
diff --git a/release/tools/arm/crochet-BEAGLEBONE.conf b/release/tools/arm/crochet-BEAGLEBONE.conf
index e72814fbdca7..7a32542ed0f9 100644
--- a/release/tools/arm/crochet-BEAGLEBONE.conf
+++ b/release/tools/arm/crochet-BEAGLEBONE.conf
@@ -27,3 +27,14 @@ FREEBSD_WORLD_EXTRA_ARGS=""
 FREEBSD_KERNEL_EXTRA_ARGS=""
 FREEBSD_EXTRA_ARGS=""
 IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${TARGET}-${TARGET_ARCH}-${KERNCONF}.img
+BEAGLEBONE_UBOOT=/tmp/external/u-boot-beaglebone
+
+beaglebone_check_uboot() {
+	mkdir -p "${BEAGLEBONE_UBOOT}"
+	ln -fs /usr/local/share/u-boot/u-boot-beaglebone/MLO \
+		${BEAGLEBONE_UBOOT}/MLO
+	ln -fs /usr/local/share/u-boot/u-boot-beaglebone/u-boot.img \
+		${BEAGLEBONE_UBOOT}/bb-uboot.img
+	ln -fs ${BOARDDIR}/files/uEnv.txt \
+		${BEAGLEBONE_UBOOT}/bb-uenv.txt
+}
-- 
cgit v1.2.3