From 45935e14a0fc06a8cbc421395700ea335c36c0bf Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Sat, 25 Jan 2014 09:07:55 +0000
Subject: [PATCH] Explicitly set XDEV_ARCH and TARGET_ARCH to 'armv6', which
 resolves boot-time issues when building 10.0-RELEASE images.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/RPI-B.conf               | 2 +-
 release/tools/arm/crochet-RPI-B.conf | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index edfe556b1fa..4952e289f90 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -28,7 +28,7 @@ CHROOTDIR="/scratch"
 EMBEDDEDBUILD=1
 EMBEDDEDPORTS="lang/python textproc/gsed"
 XDEV="arm"
-XDEV_ARCH="arm"
+XDEV_ARCH="armv6"
 KERNEL="RPI-B"
 CROCHETSRC="https://github.com/kientzle/crochet-freebsd"
 CROCHETBRANCH="trunk"
diff --git a/release/tools/arm/crochet-RPI-B.conf b/release/tools/arm/crochet-RPI-B.conf
index 6e6a0ac9271..91f297d00c1 100644
--- a/release/tools/arm/crochet-RPI-B.conf
+++ b/release/tools/arm/crochet-RPI-B.conf
@@ -17,6 +17,8 @@ WORKDIR=/usr/obj
 _BRANCH=$(make -C ${FREEBSD_SRC}/release -V BRANCH)
 _REVISION=$(make -C ${FREEBSD_SRC}/release -V REVISION)
 KERNCONF=RPI-B
+TARGET=arm
+TARGET_ARCH=armv6
 FREEBSD_BUILDWORLD_EXTRA_ARGS=""
 FREEBSD_INSTALLWORLD_EXTRA_ARGS=""
 FREEBSD_BUILDKERNEL_EXTRA_ARGS=""