From 879c1339e23ae9f521ba2354fe0d9e55dcdb19d1 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 20:50:25 +0000
Subject: Add CROSS_TOOLCHAIN for arm builds. Remove a BOARDS entry left in
 while testing. Add build-arm-ports${BOARD} target as a prerequisite when
 ARMPORTS is set. Add build-arm-KERNCONF and build-arm-ports to CLEANFILES.

Sponsored by:	The FreeBSD Foundation
---
 release/Makefile.arm                | 22 +++++++++++++++++-----
 release/arm/Makefile.BEAGLEBONE     |  3 ++-
 release/arm/Makefile.RPI-B          |  3 ++-
 release/arm/Makefile.WANDBOARD-QUAD |  3 ++-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/release/Makefile.arm b/release/Makefile.arm
index 714b2f56e675..74c62c50da1e 100644
--- a/release/Makefile.arm
+++ b/release/Makefile.arm
@@ -6,14 +6,15 @@ BOARDS?=	BEAGLEBONE \
 		RPI-B \
 		PANDABOARD \
 		WANDBOARD-QUAD \
-		ZEDBOARD \
-		NUCLEUS
+		ZEDBOARD
 
 ARMTARGETS?=
 ARMSIZE?=	1G
+ARM_WFLAGS?=	CROSS_TOOLCHAIN=armv6-gcc
 ARMPORTS?=
-CLEANFILES+=	arm-all
+
 WITH_ARM_IMAGES?=1
+CLEANFILES+=	arm-all
 
 .if defined(WITH_ARM_IMAGES) && !empty(WITH_ARM_IMAGES) && !empty(BOARDS)
 . for BOARD in ${BOARDS}
@@ -21,7 +22,8 @@ ARMTARGETS+=		arm-${BOARD:tl}
 CLEANDIRS+=		arm-${BOARD:tl}
 CLEANFILES+=		arm-${BOARD:tu}.img \
 			arm-${BOARD:tu}.raw \
-			build-arm-${BOARD:tl}
+			build-arm-${BOARD:tl} \
+			build-arm-ports${BOARD:tl}
 .  if exists(${.CURDIR}/arm/Makefile.${BOARD})
 .   include "${.CURDIR}/arm/Makefile.${BOARD}"
 .  endif
@@ -31,6 +33,16 @@ arm-${BOARD:tl}:
 . endfor
 .endif			# !WITH_ARM_IMAGES
 
-
 arm-all: ${ARMTARGETS}
 	touch ${.TARGET}
+
+build-arm-ports${BOARD:tl}:
+.if defined(ARMPORTS) && !empty(ARMPORTS)
+. if !exists(${PORTSDIR}/Makefile)
+.  error "Ports tree (${PORTSDIR}) is required."
+. endif
+. for AP in ${ARMPORTS}
+	@echo ${MAKE} -C ${PORTSDIR}/${AP} all install clean distclean
+. endfor
+.endif
+	touch ${.TARGET}
diff --git a/release/arm/Makefile.BEAGLEBONE b/release/arm/Makefile.BEAGLEBONE
index c70c29746be3..fdb1c2f5fee9 100644
--- a/release/arm/Makefile.BEAGLEBONE
+++ b/release/arm/Makefile.BEAGLEBONE
@@ -3,6 +3,7 @@
 #
 
 BOARD=		BEAGLEBONE
+ARMPORTS=	sysutils/u-boot-beaglebone
 
-build-arm-${BOARD:tl}:
+build-arm-${BOARD:tl}:	build-arm-ports${BOARD:tl}
 	touch ${.TARGET}
diff --git a/release/arm/Makefile.RPI-B b/release/arm/Makefile.RPI-B
index db36193dde1a..cf33862c0a72 100644
--- a/release/arm/Makefile.RPI-B
+++ b/release/arm/Makefile.RPI-B
@@ -3,6 +3,7 @@
 #
 
 BOARD=		RPI-B
+ARMPORTS=	sysutils/u-boot-rpi
 
-build-arm-${BOARD:tl}:
+build-arm-${BOARD:tl}:	build-arm-ports${BOARD:tl}
 	touch ${.TARGET}
diff --git a/release/arm/Makefile.WANDBOARD-QUAD b/release/arm/Makefile.WANDBOARD-QUAD
index 290bfdf46b7c..bea3d4ed4daa 100644
--- a/release/arm/Makefile.WANDBOARD-QUAD
+++ b/release/arm/Makefile.WANDBOARD-QUAD
@@ -3,6 +3,7 @@
 #
 
 BOARD=		WANDBOARD-QUAD
+ARMPORTS=	sysutils/u-boot-wandboard
 
-build-arm-${BOARD:tl}:
+build-arm-${BOARD:tl}:	build-arm-ports
 	touch ${.TARGET}
-- 
cgit v1.2.3