From e7e17a891a741570eefd9c39ef1b839cb5b98035 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 7 Mar 2014 22:10:40 +0000
Subject: [PATCH 1/2] Remove only-works-on-amd64 restriction.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf     | 8 --------
 release/arm/PANDABOARD.conf     | 8 --------
 release/arm/RPI-B.conf          | 8 --------
 release/arm/WANDBOARD-QUAD.conf | 8 --------
 4 files changed, 32 deletions(-)

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 5eb15d552247..c71eba864c69 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -2,14 +2,6 @@
 # $FreeBSD$
 #
 
-# This is only supported on amd64 right now.  It may work on
-# i386, but I do not have the hardware to test, so until I get
-# a VM set up to make sure, be cautious and assume it will not.
-if [ "$(uname -p)" != "amd64" ] || [ "$(uname -m)" != "amd64" ]; then
-    echo "This is only supported on amd64 right now."
-    exit 0
-fi
-
 # Build chroot configuration
 TARGET="amd64"
 TARGET_ARCH="amd64"
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index f39a6ec7db90..48021ec55f65 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -2,14 +2,6 @@
 # $FreeBSD$
 #
 
-# This is only supported on amd64 right now.  It may work on
-# i386, but I do not have the hardware to test, so until I get
-# a VM set up to make sure, be cautious and assume it will not.
-if [ "$(uname -p)" != "amd64" ] || [ "$(uname -m)" != "amd64" ]; then
-    echo "This is only supported on amd64 right now."
-    exit 0
-fi
-
 # Build chroot configuration
 TARGET="amd64"
 TARGET_ARCH="amd64"
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 5dad3d7ad737..840a29aba41c 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -2,14 +2,6 @@
 # $FreeBSD$
 #
 
-# This is only supported on amd64 right now.  It may work on
-# i386, but I do not have the hardware to test, so until I get
-# a VM set up to make sure, be cautious and assume it will not.
-if [ "$(uname -p)" != "amd64" ] || [ "$(uname -m)" != "amd64" ]; then
-    echo "This is only supported on amd64 right now."
-    exit 0
-fi
-
 # Build chroot configuration
 TARGET="amd64"
 TARGET_ARCH="amd64"
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index c6c3fa53b0a1..3e6e7ec2ac0f 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -2,14 +2,6 @@
 # $FreeBSD$
 #
 
-# This is only supported on amd64 right now.  It may work on
-# i386, but I do not have the hardware to test, so until I get
-# a VM set up to make sure, be cautious and assume it will not.
-if [ "$(uname -p)" != "amd64" ] || [ "$(uname -m)" != "amd64" ]; then
-    echo "This is only supported on amd64 right now."
-    exit 0
-fi
-
 # Build chroot configuration
 TARGET="amd64"
 TARGET_ARCH="amd64"

From a193d6a3209db108459e20d2f7606eacbe7ad338 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Fri, 7 Mar 2014 22:14:39 +0000
Subject: [PATCH 2/2] Add ZEDBOARD.

Tested against:	stable/10@r262905 (build only)
Sponsored by:	The FreeBSD Foundation
---
 release/arm/ZEDBOARD.conf               | 28 ++++++++++++++++++++++++
 release/tools/arm/crochet-ZEDBOARD.conf | 29 +++++++++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 release/arm/ZEDBOARD.conf
 create mode 100644 release/tools/arm/crochet-ZEDBOARD.conf

diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf
new file mode 100644
index 000000000000..19fb96738d8d
--- /dev/null
+++ b/release/arm/ZEDBOARD.conf
@@ -0,0 +1,28 @@
+#
+# $FreeBSD$
+#
+
+# Build chroot configuration
+TARGET="amd64"
+TARGET_ARCH="amd64"
+SVNROOT="svn://svn.FreeBSD.org/"
+SRCBRANCH="base/head@rHEAD"
+DOCBRANCH="doc/head@rHEAD"
+PORTBRANCH="ports/head@rHEAD"
+NODOC=yes
+
+# Build target configuration
+# Since this file is sourced by a script that runs another
+# script, these must be exported.
+set -a
+WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
+KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
+CHROOTDIR="/scratch"
+EMBEDDEDBUILD=1
+XDEV="arm"
+XDEV_ARCH="armv6"
+KERNEL="ZEDBOARD"
+CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
+CROCHETBRANCH="trunk"
+set +a
+
diff --git a/release/tools/arm/crochet-ZEDBOARD.conf b/release/tools/arm/crochet-ZEDBOARD.conf
new file mode 100644
index 000000000000..5b9caf18fc93
--- /dev/null
+++ b/release/tools/arm/crochet-ZEDBOARD.conf
@@ -0,0 +1,29 @@
+#
+# $FreeBSD$
+#
+
+# This is the configuration file for use with crochet to produce
+# FreeBSD ZedBoard images.
+
+board_setup ZedBoard
+option ImageSize 1gb
+option AutoSize
+
+export MAKEOBJDIRPREFIX=/usr/obj
+FREEBSD_SRC=/usr/src
+__MAKE_CONF=/dev/null
+SRCCONF=/dev/null
+WORKDIR=/usr/obj
+_BRANCH=$(make -C ${FREEBSD_SRC}/release -V BRANCH)
+_REVISION=$(make -C ${FREEBSD_SRC}/release -V REVISION)
+KERNCONF=ZEDBOARD
+TARGET=arm
+TARGET_ARCH=armv6
+FREEBSD_BUILDWORLD_EXTRA_ARGS="${WORLD_FLAGS}"
+FREEBSD_BUILDKERNEL_EXTRA_ARGS="${KERNEL_FLAGS}"
+FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
+FREEBSD_INSTALLKERNEL_EXTRA_ARGS=""
+FREEBSD_WORLD_EXTRA_ARGS=""
+FREEBSD_KERNEL_EXTRA_ARGS=""
+FREEBSD_EXTRA_ARGS=""
+IMG=${WORKDIR}/FreeBSD-${_REVISION}-${_BRANCH}-${TARGET}-${TARGET_ARCH}-${KERNCONF}.img