From 7e24e21572c6e3b166ca912a50dbb51d61959ae9 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 20:25:21 +0000
Subject: Initial restructure for FreeBSD/arm release builds.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/Makefile.BEAGLEBONE     | 8 ++++++++
 release/arm/Makefile.PANDABOARD     | 8 ++++++++
 release/arm/Makefile.RPI-B          | 8 ++++++++
 release/arm/Makefile.WANDBOARD-QUAD | 8 ++++++++
 release/arm/Makefile.ZEDBOARD       | 8 ++++++++
 5 files changed, 40 insertions(+)
 create mode 100644 release/arm/Makefile.BEAGLEBONE
 create mode 100644 release/arm/Makefile.PANDABOARD
 create mode 100644 release/arm/Makefile.RPI-B
 create mode 100644 release/arm/Makefile.WANDBOARD-QUAD
 create mode 100644 release/arm/Makefile.ZEDBOARD

(limited to 'release/arm')

diff --git a/release/arm/Makefile.BEAGLEBONE b/release/arm/Makefile.BEAGLEBONE
new file mode 100644
index 0000000..c70c297
--- /dev/null
+++ b/release/arm/Makefile.BEAGLEBONE
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD=		BEAGLEBONE
+
+build-arm-${BOARD:tl}:
+	touch ${.TARGET}
diff --git a/release/arm/Makefile.PANDABOARD b/release/arm/Makefile.PANDABOARD
new file mode 100644
index 0000000..ecec392
--- /dev/null
+++ b/release/arm/Makefile.PANDABOARD
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD=		PANDABOARD
+
+build-arm-${BOARD:tl}:
+	touch ${.TARGET}
diff --git a/release/arm/Makefile.RPI-B b/release/arm/Makefile.RPI-B
new file mode 100644
index 0000000..db36193
--- /dev/null
+++ b/release/arm/Makefile.RPI-B
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD=		RPI-B
+
+build-arm-${BOARD:tl}:
+	touch ${.TARGET}
diff --git a/release/arm/Makefile.WANDBOARD-QUAD b/release/arm/Makefile.WANDBOARD-QUAD
new file mode 100644
index 0000000..290bfdf
--- /dev/null
+++ b/release/arm/Makefile.WANDBOARD-QUAD
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD=		WANDBOARD-QUAD
+
+build-arm-${BOARD:tl}:
+	touch ${.TARGET}
diff --git a/release/arm/Makefile.ZEDBOARD b/release/arm/Makefile.ZEDBOARD
new file mode 100644
index 0000000..a17473f
--- /dev/null
+++ b/release/arm/Makefile.ZEDBOARD
@@ -0,0 +1,8 @@
+#
+# $FreeBSD$
+#
+
+BOARD=		ZEDBOARD
+
+build-arm-${BOARD:tl}:
+	touch ${.TARGET}
-- 
cgit v1.1


From 0790752ed0460c3128a3f985680602d2dabd29b3 Mon Sep 17 00:00:00 2001
From: gjb <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/arm/Makefile.BEAGLEBONE     | 3 ++-
 release/arm/Makefile.RPI-B          | 3 ++-
 release/arm/Makefile.WANDBOARD-QUAD | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/Makefile.BEAGLEBONE b/release/arm/Makefile.BEAGLEBONE
index c70c297..fdb1c2f 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 db36193..cf33862 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 290bfdf..bea3d4e 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.1


From 2f97a0022352341ac81abcbb5a5b79c6f1cf222a Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Wed, 11 Feb 2015 20:51:58 +0000
Subject: Fix build-arm-ports target for WANDBOARD-QUAD.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/Makefile.WANDBOARD-QUAD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'release/arm')

diff --git a/release/arm/Makefile.WANDBOARD-QUAD b/release/arm/Makefile.WANDBOARD-QUAD
index bea3d4e..9afc9f6 100644
--- a/release/arm/Makefile.WANDBOARD-QUAD
+++ b/release/arm/Makefile.WANDBOARD-QUAD
@@ -5,5 +5,5 @@
 BOARD=		WANDBOARD-QUAD
 ARMPORTS=	sysutils/u-boot-wandboard
 
-build-arm-${BOARD:tl}:	build-arm-ports
+build-arm-${BOARD:tl}:	build-arm-ports${BOARD:tl}
 	touch ${.TARGET}
-- 
cgit v1.1


From 14f6e421fa9d1d190eef10be64d467dcd2c2f82c Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 12 Feb 2015 00:50:54 +0000
Subject: Add a ROADMAP file for FreeBSD/arm release builds, which will make
 final documentation much easier when done.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/ROADMAP | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 release/arm/ROADMAP

(limited to 'release/arm')

diff --git a/release/arm/ROADMAP b/release/arm/ROADMAP
new file mode 100644
index 0000000..c76a41e
--- /dev/null
+++ b/release/arm/ROADMAP
@@ -0,0 +1,18 @@
+#
+# $FreeBSD$
+#
+
+== WORKFLOW
+=====================================================================
+
+- buildworld [1]
+- buildkernel [1]
+- ports build [2]
+- md(4) device creation, mount, installworld, installkernel
+- u-boot magic [2]
+- rc.conf edits (gpart resize, sshd, etc.)
+- ???
+- profit.
+
+[1]: Requires CROSS_TOOLCHAIN
+[2]: If necessary
-- 
cgit v1.1


From d80ecfbe72b8ed71093c9e5af6df5f0561b96d8c Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 26 Mar 2015 03:05:07 +0000
Subject: Attempt to create the final image (though not nearly ready for it
 yet).

This is probably very broken and/or wrong, but that's why
we have projects branches.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/Makefile.BEAGLEBONE     | 1 +
 release/arm/Makefile.PANDABOARD     | 1 +
 release/arm/Makefile.RPI-B          | 1 +
 release/arm/Makefile.WANDBOARD-QUAD | 1 +
 release/arm/Makefile.ZEDBOARD       | 1 +
 5 files changed, 5 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/Makefile.BEAGLEBONE b/release/arm/Makefile.BEAGLEBONE
index fdb1c2f..5f59f03 100644
--- a/release/arm/Makefile.BEAGLEBONE
+++ b/release/arm/Makefile.BEAGLEBONE
@@ -3,6 +3,7 @@
 #
 
 BOARD=		BEAGLEBONE
+${BOARD}PARTSCHEME=	mbr
 ARMPORTS=	sysutils/u-boot-beaglebone
 
 build-arm-${BOARD:tl}:	build-arm-ports${BOARD:tl}
diff --git a/release/arm/Makefile.PANDABOARD b/release/arm/Makefile.PANDABOARD
index ecec392..cd911e9 100644
--- a/release/arm/Makefile.PANDABOARD
+++ b/release/arm/Makefile.PANDABOARD
@@ -3,6 +3,7 @@
 #
 
 BOARD=		PANDABOARD
+${BOARD}PARTSCHEME=	mbr
 
 build-arm-${BOARD:tl}:
 	touch ${.TARGET}
diff --git a/release/arm/Makefile.RPI-B b/release/arm/Makefile.RPI-B
index cf33862..c81e51e 100644
--- a/release/arm/Makefile.RPI-B
+++ b/release/arm/Makefile.RPI-B
@@ -3,6 +3,7 @@
 #
 
 BOARD=		RPI-B
+${BOARD}PARTSCHEME=	mbr
 ARMPORTS=	sysutils/u-boot-rpi
 
 build-arm-${BOARD:tl}:	build-arm-ports${BOARD:tl}
diff --git a/release/arm/Makefile.WANDBOARD-QUAD b/release/arm/Makefile.WANDBOARD-QUAD
index 9afc9f6..d7f7ff7 100644
--- a/release/arm/Makefile.WANDBOARD-QUAD
+++ b/release/arm/Makefile.WANDBOARD-QUAD
@@ -3,6 +3,7 @@
 #
 
 BOARD=		WANDBOARD-QUAD
+${BOARD}PARTSCHEME=	mbr
 ARMPORTS=	sysutils/u-boot-wandboard
 
 build-arm-${BOARD:tl}:	build-arm-ports${BOARD:tl}
diff --git a/release/arm/Makefile.ZEDBOARD b/release/arm/Makefile.ZEDBOARD
index a17473f..5d3a685 100644
--- a/release/arm/Makefile.ZEDBOARD
+++ b/release/arm/Makefile.ZEDBOARD
@@ -3,6 +3,7 @@
 #
 
 BOARD=		ZEDBOARD
+${BOARD}PARTSCHEME=	mbr
 
 build-arm-${BOARD:tl}:
 	touch ${.TARGET}
-- 
cgit v1.1


From 7a5a99c8dec823faffa0a298712ed4bbd7455ebc Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Wed, 6 May 2015 15:41:43 +0000
Subject: In extra_chroot_setup(), use 'uname -U' to determine OSVERSION.

Move the port build for EMBEDDEDPORTS (if set) from arm/release.sh
to release.sh.

Remove arm/release.sh.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/release.sh | 151 -------------------------------------------------
 1 file changed, 151 deletions(-)
 delete mode 100755 release/arm/release.sh

(limited to 'release/arm')

diff --git a/release/arm/release.sh b/release/arm/release.sh
deleted file mode 100755
index c68f812..0000000
--- a/release/arm/release.sh
+++ /dev/null
@@ -1,151 +0,0 @@
-#!/bin/sh
-#-
-# Copyright (c) 2013, 2014 The FreeBSD Foundation
-# All rights reserved.
-#
-# This software was developed by Glen Barber
-# under sponsorship from the FreeBSD Foundation.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-# $FreeBSD$
-#
-
-# This script is intended to be called by release/release.sh to build ARM
-# images for release.  It is not intended to be run directly.  This sets up
-# the software needed within a build chroot, then runs crochet to provide
-# downloadable images for embedded devices.
-
-set -e
-
-before_build() {
-	WANT_UBOOT=
-	KNOWNHASH=
-	UBOOT_VERSION=
-	case ${KERNEL} in
-		PANDABOARD)
-			WANT_UBOOT=1
-			KNOWNHASH="e08e20a6979bfca6eebb9a2b0e42aa4416af3d796332fd63a3470495a089d496"
-			UBOOT_VERSION="u-boot-2012.07"
-			;;
-		WANDBOARD-QUAD)
-			WANT_UBOOT=1
-			KNOWNHASH="b4f83b8db325c21671a997198ec3a373e2e00dde2fcf17be9b9afd7cfd727f56"
-			UBOOT_VERSION="u-boot-2014.07"
-			;;
-		*)
-			# Fallthrough.
-			;;
-	esac
-	if [ ! -z ${WANT_UBOOT} ]; then
-		chroot ${CHROOTDIR} fetch -o /tmp/crochet/${UBOOT_VERSION}.tar.bz2 \
-			http://people.freebsd.org/~gjb/${UBOOT_VERSION}.tar.bz2
-		UBOOT_HASH="$(sha256 -q ${CHROOTDIR}/tmp/crochet/${UBOOT_VERSION}.tar.bz2)"
-		if [ "${UBOOT_HASH}" != "${KNOWNHASH}" ]; then
-			echo "Checksum mismatch!  Exiting now."
-			exit 1
-		fi
-		chroot ${CHROOTDIR} tar xf /tmp/crochet/${UBOOT_VERSION}.tar.bz2 \
-			-C /tmp/crochet/ 
-	fi
-}
-
-install_crochet() {
-	chroot ${CHROOTDIR} svn co -q ${CROCHETSRC}/${CROCHETBRANCH} \
-		/tmp/crochet
-}
-
-install_uboot() {
-	# Only fetch u-boot sources if UBOOTSRC is set; otherwise it is
-	# not needed.
-	if [ -n "${UBOOTSRC}" ]; then
-		continue
-	else
-		return 0
-	fi
-	chroot ${CHROOTDIR} svn co -q ${UBOOTSRC}/${UBOOTBRANCH} \
-		/${UBOOTDIR}
-}
-
-main() {
-	# Fix broken ports that use kern.osreldate.
-	OSVERSION=$(chroot ${CHROOTDIR} /usr/bin/uname -U)
-	export OSVERSION
-	REVISION=$(chroot ${CHROOTDIR} make -C /usr/src/release -V REVISION)
-	BRANCH=$(chroot ${CHROOTDIR} make -C /usr/src/release -V BRANCH)
-	UNAME_r=${REVISION}-${BRANCH}
-	export UNAME_r
-	export XZ_CMD=$(chroot ${CHROOTDIR} make -C /usr/src/release -V XZ_CMD)
-
-	# Build the 'xdev' target for crochet.
-	eval chroot ${CHROOTDIR} make -C /usr/src \
-		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
-		TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
-		${WORLD_FLAGS} xdev
-
-	# Install the cross-build symlinks to /usr/bin to make crochet
-	# happy.
-	eval chroot ${CHROOTDIR} make -C /usr/src \
-		${XDEV_FLAGS} XDEV=${XDEV} XDEV_ARCH=${XDEV_ARCH} \
-		TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
-		${WORLD_FLAGS} xdev-links || true
-
-	# Run the ldconfig(8) startup script so /var/run/ld-elf*.so.hints
-	# is created.
-	eval chroot ${CHROOTDIR} /etc/rc.d/ldconfig forcerestart
-	# Install security/ca_root_nss since we need to check the https
-	# certificate of github.
-	eval chroot ${CHROOTDIR} make -C /usr/ports/security/ca_root_nss \
-		OPTIONS_SET="ETCSYMLINK" BATCH=1 FORCE_PKG_REGISTER=1 \
-		install clean distclean
-	EMBEDDEDPORTS="${EMBEDDEDPORTS} devel/subversion"
-	for _PORT in ${EMBEDDEDPORTS}; do
-		eval chroot ${CHROOTDIR} make -C /usr/ports/${_PORT} \
-			BATCH=1 FORCE_PKG_REGISTER=1 install clean distclean
-	done
-
-	# Certain u-boot versions hardcode the use of a host gcc, and gcc's
-	# build relies on having gperf installed.
-	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/gperf \
-		WITH_GCC=1 ${WORLD_FLAGS} obj
-	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/gperf \
-		WITH_GCC=1 ${WORLD_FLAGS} -j1 depend all
-	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/gperf \
-		WITH_GCC=1 ${WORLD_FLAGS} -j1 install
-	eval chroot ${CHROOTDIR} make -C /usr/src/gnu/usr.bin/cc \
-		WITH_GCC=1 ${WORLD_FLAGS} -j1 obj depend all install
-
-	mkdir -p ${CHROOTDIR}/tmp/crochet/work
-	before_build
-	install_crochet
-	install_uboot
-	eval chroot ${CHROOTDIR} /bin/sh /tmp/crochet/crochet.sh \
-		-c /tmp/external/${XDEV}/crochet-${KERNEL}.conf
-	mkdir -p ${CHROOTDIR}/R/
-	cp -p ${CHROOTDIR}/usr/obj/*.img ${CHROOTDIR}/R/
-	${XZ_CMD} ${CHROOTDIR}/R/FreeBSD*.img
-	cd ${CHROOTDIR}/R/ && sha256 FreeBSD*.img.xz > CHECKSUM.SHA256
-	cd ${CHROOTDIR}/R/ && md5 FreeBSD*.img.xz > CHECKSUM.MD5
-}
-
-main "$@"
-exit 0
-- 
cgit v1.1


From 49990fc7c2d96531671393b4c386b11a505117c8 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Wed, 6 May 2015 15:58:21 +0000
Subject: Update the arm/*.conf configuration files to only set EMBEDDEDBUILD,
 EMBEDDED_TARGET, EMBEDDED_TARGET_ARCH, EMBEDDEDPORTS, and KERNEL.

In release.sh, set TARGET and TARGET_ARCH to the
EMBEDDED_* variants from the configuration file.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf     | 38 +++++---------------------------------
 release/arm/PANDABOARD.conf     | 37 +++++--------------------------------
 release/arm/RPI-B.conf          | 40 +++++-----------------------------------
 release/arm/RPI2.conf           | 38 +++++---------------------------------
 release/arm/WANDBOARD-QUAD.conf | 37 +++++--------------------------------
 release/arm/ZEDBOARD.conf       | 35 ++++-------------------------------
 6 files changed, 29 insertions(+), 196 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 72337f8..19b88cb 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -3,36 +3,8 @@
 # $FreeBSD$
 #
 
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@rHEAD"
-export NODOC=yes
-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() {
-	# Avoid collision with TARGET and XDEV.
-	unset XDEV XDEV_ARCH KERNEL
-	export TARGET="amd64"
-	export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset TARGET TARGET_ARCH
-	export EMBEDDEDPORTS="lang/python textproc/gsed"
-	export XDEV="arm"
-	export XDEV_ARCH="armv6"
-	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
-	export KERNEL="BEAGLEBONE"
-	export CROCHETSRC="https://github.com/freebsd/crochet"
-	export CROCHETBRANCH="trunk@rHEAD"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
+KERNEL="BEAGLEBONE"
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index dc8952d..4cbe7e5 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -3,35 +3,8 @@
 # $FreeBSD$
 #
 
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@rHEAD"
-export NODOC=yes
-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="lang/python textproc/gsed"
-
-# Build chroot configuration
-load_chroot_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset XDEV XDEV_ARCH KERNEL
-	export TARGET="amd64"
-	export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset TARGET TARGET_ARCH
-	export XDEV="arm"
-	export XDEV_ARCH="armv6"
-	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
-	export KERNEL="PANDABOARD"
-	export CROCHETSRC="https://github.com/freebsd/crochet"
-	export CROCHETBRANCH="trunk@rHEAD"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
+KERNEL="PANDABOARD"
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index aae60c9..28562c1 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -3,38 +3,8 @@
 # $FreeBSD$
 #
 
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@rHEAD"
-export NODOC=yes
-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="lang/python textproc/gsed"
-
-# Build chroot configuration
-load_chroot_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset XDEV XDEV_ARCH KERNEL
-	export TARGET="amd64"
-	export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset TARGET TARGET_ARCH
-	export XDEV="arm"
-	export XDEV_ARCH="armv6"
-	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
-	export KERNEL="RPI-B"
-	export CROCHETSRC="https://github.com/freebsd/crochet"
-	export CROCHETBRANCH="trunk@rHEAD"
-	export UBOOTSRC="https://github.com/gonzoua/u-boot-pi"
-	export UBOOTBRANCH="trunk"
-	export UBOOTDIR="/tmp/crochet/u-boot-rpi"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-rpi"
+KERNEL="RPI-B"
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index bb8ebe9..4f8ea2f 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -3,36 +3,8 @@
 # $FreeBSD$
 #
 
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@rHEAD"
-export NODOC=yes
-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-rpi2"
-
-# Build chroot configuration
-load_chroot_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset XDEV XDEV_ARCH KERNEL
-	export TARGET="amd64"
-	export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset TARGET TARGET_ARCH
-	export XDEV="arm"
-	export XDEV_ARCH="armv6"
-	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
-	export KERNEL="RPI2"
-	export CROCHETSRC="https://github.com/freebsd/crochet"
-	export CROCHETBRANCH="trunk@rHEAD"
-}
-
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-rpi2"
+KERNEL="RPI2"
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index c3fff91..a368ea5 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -3,35 +3,8 @@
 # $FreeBSD$
 #
 
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@rHEAD"
-export NODOC=yes
-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="lang/python textproc/gsed"
-
-# Build chroot configuration
-load_chroot_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset XDEV XDEV_ARCH KERNEL
-	export TARGET="amd64"
-	export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset TARGET TARGET_ARCH
-	export XDEV="arm"
-	export XDEV_ARCH="armv6"
-	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
-	export KERNEL="WANDBOARD-QUAD"
-	export CROCHETSRC="https://github.com/freebsd/crochet"
-	export CROCHETBRANCH="trunk@rHEAD"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-wandboard"
+KERNEL="WANDBOARD-QUAD"
diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf
index 4d0a461..8c08fb1 100644
--- a/release/arm/ZEDBOARD.conf
+++ b/release/arm/ZEDBOARD.conf
@@ -3,34 +3,7 @@
 # $FreeBSD$
 #
 
-# Global variables.
-export SVNROOT="svn://svn.FreeBSD.org/"
-export SRCBRANCH="base/head@rHEAD"
-export DOCBRANCH="doc/head@rHEAD"
-export PORTBRANCH="ports/head@rHEAD"
-export NODOC=yes
-export WORLD_FLAGS="-j $(sysctl -n hw.ncpu)"
-export export KERNEL_FLAGS="-j $(( $(( $(sysctl -n hw.ncpu) + 1 )) / 2 ))"
-export CHROOTDIR="/scratch"
-export EMBEDDEDBUILD=1
-
-# Build chroot configuration
-load_chroot_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset XDEV XDEV_ARCH KERNEL
-	export TARGET="amd64"
-	export TARGET_ARCH="amd64"
-}
-
-# Build target configuration
-load_target_env() {
-	# Avoid collision with TARGET and XDEV.
-	unset TARGET TARGET_ARCH
-	export XDEV="arm"
-	export XDEV_ARCH="armv6"
-	export XDEV_FLAGS="WITH_GCC=1 WITH_GCC_BOOTSTRAP=1 WITHOUT_CLANG_IS_CC=1"
-	export XDEV_FLAGS="${XDEV_FLAGS} MK_TESTS=no"
-	export KERNEL="ZEDBOARD"
-	export CROCHETSRC="https://github.com/freebsd/crochet"
-	export CROCHETBRANCH="trunk@rHEAD"
-}
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+KERNEL="ZEDBOARD"
-- 
cgit v1.1


From db697baa509958351bb560d893c32bcf39f76b67 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Wed, 6 May 2015 19:58:12 +0000
Subject: Add tools/arm.subr to contain common subroutines used for building
 arm images.  This is similar to tools/vmimage.subr used for building virtual
 machine disk images.  By default, only arm_create_disk() and
 arm_install_base() contain real functionality here, and arm_install_uboot()
 must be overridden in the arm/KERNEL.conf file.

In release.sh, make create_arm_armv6_build_release() do
something now.

In arm/BEAGLEBONE.conf, set IMAGE_SIZE, PART_SCHEME, FAT_SIZE,
FAT_TYPE, and MD_ARGS, as well as make arm_install_uboot()
functional.

Parts of this were taken from disecting a previous BEAGLEBONE
image, and other parts obtained from Crochet sources.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 19b88cb..70dadc0 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -8,3 +8,24 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
 KERNEL="BEAGLEBONE"
+IMAGE_SIZE="1G"
+PART_SCHEME="MBR"
+FAT_SIZE="2m"
+FAT_TYPE="12"
+MD_ARGS="-x 63 -y 255"
+
+arm_install_uboot() {
+	UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
+	FDT_DIR="${WORLDIR}/sys/boot/fdt/dts/arm"
+	mount_msdosfs /dev/${mddev}s1 ${DESTDIR}
+	cp -p ${UBOOT_DIR}/MLO ${DESTDIR}/MLO
+	cp -p ${UBOOT_DIR}/u-boot.img ${DESTDIR}/bb-uboot.img
+	cp -p ${FDT_DIR}/beaglebone.dts ${DESTDIR}/bbone.dts
+	cp -p ${FDT_DIR}/beaglebone.dts ${DESTDIR}/bbone.dtb
+	cp -p ${FDT_DIR}/beaglebone-black.dts ${DESTDIR}/bboneblk.dts
+	cp -p ${FDT_DIR}/beaglebone-black.dts ${DESTDIR}/bboneblk.dtb
+	touch ${DESTDIR}/bb-uEnv.txt
+	umount_loop ${DESTDIR}
+	
+	return 0
+}
-- 
cgit v1.1


From 353abfd8a4ede89eb228f76aa7fc2024037d7b50 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 17:33:21 +0000
Subject: Fix file/directory paths.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 70dadc0..2ac7e15 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -15,17 +15,17 @@ FAT_TYPE="12"
 MD_ARGS="-x 63 -y 255"
 
 arm_install_uboot() {
-	UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
-	FDT_DIR="${WORLDIR}/sys/boot/fdt/dts/arm"
-	mount_msdosfs /dev/${mddev}s1 ${DESTDIR}
-	cp -p ${UBOOT_DIR}/MLO ${DESTDIR}/MLO
-	cp -p ${UBOOT_DIR}/u-boot.img ${DESTDIR}/bb-uboot.img
-	cp -p ${FDT_DIR}/beaglebone.dts ${DESTDIR}/bbone.dts
-	cp -p ${FDT_DIR}/beaglebone.dts ${DESTDIR}/bbone.dtb
-	cp -p ${FDT_DIR}/beaglebone-black.dts ${DESTDIR}/bboneblk.dts
-	cp -p ${FDT_DIR}/beaglebone-black.dts ${DESTDIR}/bboneblk.dtb
-	touch ${DESTDIR}/bb-uEnv.txt
-	umount_loop ${DESTDIR}
+	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
+	FDT_DIR="${CHROOTDIR}/${WORLDIR}/sys/boot/fdt/dts/arm"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${DESTDIR}
+	cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${DESTDIR}/MLO
+	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${DESTDIR}/bb-uboot.img
+	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dts
+	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dtb
+	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dts
+	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dtb
+	touch ${CHROOTDIR}/${DESTDIR}/bb-uEnv.txt
+	umount_loop ${CHROOTDIR}/${DESTDIR}
 	
 	return 0
 }
-- 
cgit v1.1


From dd14d1e0ad341a2249343204c57779b03b23c151 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 17:48:19 +0000
Subject: Do not rename u-boot.img file when copying to the FAT partition.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 2ac7e15..da18ff1 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -19,7 +19,7 @@ arm_install_uboot() {
 	FDT_DIR="${CHROOTDIR}/${WORLDIR}/sys/boot/fdt/dts/arm"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${DESTDIR}
 	cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${DESTDIR}/MLO
-	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${DESTDIR}/bb-uboot.img
+	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${DESTDIR}/u-boot.img
 	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dts
 	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dtb
 	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dts
-- 
cgit v1.1


From 8db5e66f8992eb1f05ca70e4000df2f0a455457f Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 17:50:24 +0000
Subject: Set UBLDR_LOADADDR for the BEAGLEBONE image.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index da18ff1..9845b15 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -8,6 +8,7 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
 KERNEL="BEAGLEBONE"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
 FAT_SIZE="2m"
-- 
cgit v1.1


From 835daf69d39e7a9aba7cc75072b3529c30ce3375 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 18:00:12 +0000
Subject: In arm_install_uboot(), mount both FAT and UFS partitions in the
 empty DESTDIR, and update path names. Copy the ubldr to the FAT partition.
 [1]

Spotted by:	andrew [1]
Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 9845b15..2b2c787 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -18,15 +18,25 @@ MD_ARGS="-x 63 -y 255"
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
 	FDT_DIR="${CHROOTDIR}/${WORLDIR}/sys/boot/fdt/dts/arm"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${DESTDIR}
-	cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${DESTDIR}/MLO
-	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${DESTDIR}/u-boot.img
-	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dts
-	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${DESTDIR}/bbone.dtb
-	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dts
-	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${DESTDIR}/bboneblk.dtb
-	touch ${CHROOTDIR}/${DESTDIR}/bb-uEnv.txt
-	umount_loop ${CHROOTDIR}/${DESTDIR}
+	FATMOUNT="${DESTDIR}/fat"
+	UFSMOUNT="${DESTDIR}/ufs"
+	mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
+	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
+	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${FATMOUNT}/bbone.dts
+	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${FATMOUNT}/bbone.dtb
+	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${FATMOUNT}/bboneblk.dts
+	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${FATMOUNT}/bboneblk.dtb
+	touch ${CHROOTDIR}/${FATMOUNT}/bb-uEnv.txt
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
+		${CHROOTDIR}/${FATMOUNT}/ubldr
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	umount_loop ${CHROOTDIR}/${UFSMOUNT}
+	rmdir ${CHROOTDIR}/${FATMOUNT}
+	rmdir ${CHROOTDIR}/${UFSMOUNT}
 	
 	return 0
 }
-- 
cgit v1.1


From 355240e2f89077fd4bd530e8ae43093f506fd2c3 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 18:32:11 +0000
Subject: Reduce the number of files copied onto the FAT partition. The DTB
 files are loaded from /boot/dtb on the UFS filesystem.

Submitted by:	loos
Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 2b2c787..8e71b9b 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -25,11 +25,6 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
 	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
-	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${FATMOUNT}/bbone.dts
-	cp -p ${FDT_DIR}/beaglebone.dts ${CHROOTDIR}/${FATMOUNT}/bbone.dtb
-	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${FATMOUNT}/bboneblk.dts
-	cp -p ${FDT_DIR}/beaglebone-black.dts ${CHROOTDIR}/${FATMOUNT}/bboneblk.dtb
-	touch ${CHROOTDIR}/${FATMOUNT}/bb-uEnv.txt
 	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
 		${CHROOTDIR}/${FATMOUNT}/ubldr
 	sync
-- 
cgit v1.1


From de17051a0510655f00e20d6acac41189022f212c Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 18:41:23 +0000
Subject: Remove FDT_DIR definition, which is no longer needed.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 1 -
 1 file changed, 1 deletion(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 8e71b9b..ca16018 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -17,7 +17,6 @@ MD_ARGS="-x 63 -y 255"
 
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
-	FDT_DIR="${CHROOTDIR}/${WORLDIR}/sys/boot/fdt/dts/arm"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
 	mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-- 
cgit v1.1


From ccd6128133e74cd32255ea953572fde013b7d5c2 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 18:47:59 +0000
Subject: Add initial native suppor for RPI-B:  - Set UBLDR_LOADADDR.  -
 Include files to install to the FAT partition.

Obtained from:	Crochet
Sponsored by:	The FreeBSD Foundation
---
 release/arm/RPI-B.conf | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 28562c1..1607dcb 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -8,3 +8,32 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-rpi"
 KERNEL="RPI-B"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
+IMAGE_SIZE="1G"
+PART_SCHEME="MBR"
+FAT_SIZE="17m"
+FAT_TYPE="16"
+MD_ARGS="-x 63 -y 255"
+
+arm_install_uboot() {
+	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi"
+	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
+		start.elf start_cd.elf ubldr uboot.img"
+	FATMOUNT="${DESTDIR}/fat"
+	UFSMOUNT="${DESTDIR}/ufs"
+	mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	for _UF in ${UBOOT_FILES}; do
+		cp -p ${UBOOT_DIR}/${_UF} ${CHROOTDIR}/${FATMOUNT}/${_UF}
+	done
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
+		${CHROOTDIR}/${FATMOUNT}/ubldr
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	umount_loop ${CHROOTDIR}/${UFSMOUNT}
+	rmdir ${CHROOTDIR}/${FATMOUNT}
+	rmdir ${CHROOTDIR}/${UFSMOUNT}
+	
+	return 0
+}
-- 
cgit v1.1


From 1b0542d03edc4cb7255692c679f505313a11f1e9 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 18:48:47 +0000
Subject: Set NODOC=1 to avoid building the reldoc target.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf     | 1 +
 release/arm/PANDABOARD.conf     | 1 +
 release/arm/RPI-B.conf          | 1 +
 release/arm/RPI2.conf           | 1 +
 release/arm/WANDBOARD-QUAD.conf | 1 +
 release/arm/ZEDBOARD.conf       | 1 +
 6 files changed, 6 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index ca16018..7237725 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -14,6 +14,7 @@ PART_SCHEME="MBR"
 FAT_SIZE="2m"
 FAT_TYPE="12"
 MD_ARGS="-x 63 -y 255"
+NODOC=1
 
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 4cbe7e5..439fd37 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -8,3 +8,4 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
 KERNEL="PANDABOARD"
+NODOC=1
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 1607dcb..397d174 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -14,6 +14,7 @@ PART_SCHEME="MBR"
 FAT_SIZE="17m"
 FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
+NODOC=1
 
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi"
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 4f8ea2f..e4b5659 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -8,3 +8,4 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-rpi2"
 KERNEL="RPI2"
+NODOC=1
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index a368ea5..2f3ecf6 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -8,3 +8,4 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 KERNEL="WANDBOARD-QUAD"
+NODOC=1
diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf
index 8c08fb1..507117a 100644
--- a/release/arm/ZEDBOARD.conf
+++ b/release/arm/ZEDBOARD.conf
@@ -7,3 +7,4 @@ EMBEDDEDBUILD=1
 EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 KERNEL="ZEDBOARD"
+NODOC=1
-- 
cgit v1.1


From 0b9e3dc2e4bf5ce61f47e6c80ec07ed8811b1402 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 18:51:59 +0000
Subject: Add entries to uenv.txt.

Obtained from:	Crochet
Sponsored by:	The FreeBSD Foundation
---
 release/arm/RPI-B.conf | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 397d174..ab93053 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -30,6 +30,10 @@ arm_install_uboot() {
 	done
 	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
 		${CHROOTDIR}/${FATMOUNT}/ubldr
+	echo 'loadbootscript=fatload mmc 0 0x2000000 ubldr' > \
+		${CHROOTDIR}/${FATMOUNT}/uenv.txt
+	echo 'bootscript=fdt addr 0x100;bootelf 0x2000000' >> \
+		${CHROOTDIR}/${FATMOUNT}/uenv.txt
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
-- 
cgit v1.1


From a30e226e45ab03406e28bcc70b6238e907e6334a Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 18:53:48 +0000
Subject: Fix a copy/paste mistake.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/RPI-B.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'release/arm')

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index ab93053..9ee1762 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -19,7 +19,7 @@ NODOC=1
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi"
 	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
-		start.elf start_cd.elf ubldr uboot.img"
+		start.elf start_cd.elf uboot.img"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
 	mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-- 
cgit v1.1


From adf94dc7b1ae94c658d5c59fd6625900e181770c Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 19:10:08 +0000
Subject: Fix creating directories within DESTDIR.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 2 +-
 release/arm/RPI-B.conf      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index 7237725..add96e1 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -20,7 +20,7 @@ arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
-	mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 9ee1762..41301f7 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -22,7 +22,7 @@ arm_install_uboot() {
 		start.elf start_cd.elf uboot.img"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
-	mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
 	for _UF in ${UBOOT_FILES}; do
-- 
cgit v1.1


From 6d28b8313edf8e71a9665d5ce280d0ee65665723 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 19:47:15 +0000
Subject: Remove arm/Makefile.{KERNEL} files, as this project branch is now
 going in a different direction than originally planned.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/Makefile.BEAGLEBONE     | 10 ----------
 release/arm/Makefile.PANDABOARD     |  9 ---------
 release/arm/Makefile.RPI-B          | 10 ----------
 release/arm/Makefile.WANDBOARD-QUAD | 10 ----------
 release/arm/Makefile.ZEDBOARD       |  9 ---------
 5 files changed, 48 deletions(-)
 delete mode 100644 release/arm/Makefile.BEAGLEBONE
 delete mode 100644 release/arm/Makefile.PANDABOARD
 delete mode 100644 release/arm/Makefile.RPI-B
 delete mode 100644 release/arm/Makefile.WANDBOARD-QUAD
 delete mode 100644 release/arm/Makefile.ZEDBOARD

(limited to 'release/arm')

diff --git a/release/arm/Makefile.BEAGLEBONE b/release/arm/Makefile.BEAGLEBONE
deleted file mode 100644
index 5f59f03..0000000
--- a/release/arm/Makefile.BEAGLEBONE
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $FreeBSD$
-#
-
-BOARD=		BEAGLEBONE
-${BOARD}PARTSCHEME=	mbr
-ARMPORTS=	sysutils/u-boot-beaglebone
-
-build-arm-${BOARD:tl}:	build-arm-ports${BOARD:tl}
-	touch ${.TARGET}
diff --git a/release/arm/Makefile.PANDABOARD b/release/arm/Makefile.PANDABOARD
deleted file mode 100644
index cd911e9..0000000
--- a/release/arm/Makefile.PANDABOARD
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-BOARD=		PANDABOARD
-${BOARD}PARTSCHEME=	mbr
-
-build-arm-${BOARD:tl}:
-	touch ${.TARGET}
diff --git a/release/arm/Makefile.RPI-B b/release/arm/Makefile.RPI-B
deleted file mode 100644
index c81e51e..0000000
--- a/release/arm/Makefile.RPI-B
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $FreeBSD$
-#
-
-BOARD=		RPI-B
-${BOARD}PARTSCHEME=	mbr
-ARMPORTS=	sysutils/u-boot-rpi
-
-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
deleted file mode 100644
index d7f7ff7..0000000
--- a/release/arm/Makefile.WANDBOARD-QUAD
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $FreeBSD$
-#
-
-BOARD=		WANDBOARD-QUAD
-${BOARD}PARTSCHEME=	mbr
-ARMPORTS=	sysutils/u-boot-wandboard
-
-build-arm-${BOARD:tl}:	build-arm-ports${BOARD:tl}
-	touch ${.TARGET}
diff --git a/release/arm/Makefile.ZEDBOARD b/release/arm/Makefile.ZEDBOARD
deleted file mode 100644
index 5d3a685..0000000
--- a/release/arm/Makefile.ZEDBOARD
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# $FreeBSD$
-#
-
-BOARD=		ZEDBOARD
-${BOARD}PARTSCHEME=	mbr
-
-build-arm-${BOARD:tl}:
-	touch ${.TARGET}
-- 
cgit v1.1


From 8642bea6989d18b1b97e678da461703e531857a8 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 19:48:06 +0000
Subject: Remove the arm/ROADMAP file.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/ROADMAP | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 release/arm/ROADMAP

(limited to 'release/arm')

diff --git a/release/arm/ROADMAP b/release/arm/ROADMAP
deleted file mode 100644
index c76a41e..0000000
--- a/release/arm/ROADMAP
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# $FreeBSD$
-#
-
-== WORKFLOW
-=====================================================================
-
-- buildworld [1]
-- buildkernel [1]
-- ports build [2]
-- md(4) device creation, mount, installworld, installkernel
-- u-boot magic [2]
-- rc.conf edits (gpart resize, sshd, etc.)
-- ???
-- profit.
-
-[1]: Requires CROSS_TOOLCHAIN
-[2]: If necessary
-- 
cgit v1.1


From 22a124cc4e9c8a49acbc96703a978fa56c0d4f80 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 20:02:50 +0000
Subject: Spell 'u-boot.img' correctly.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/RPI-B.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'release/arm')

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 41301f7..4715c73 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -19,7 +19,7 @@ NODOC=1
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi"
 	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
-		start.elf start_cd.elf uboot.img"
+		start.elf start_cd.elf u-boot.img"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-- 
cgit v1.1


From 5c43f80d5410d6cbdb2a695d00d32d8e984768af Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 20:06:39 +0000
Subject: Remove the ZEDBOARD configuration file, as it does not have a
 corresponding u-boot port in the Ports Collection.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/ZEDBOARD.conf | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 release/arm/ZEDBOARD.conf

(limited to 'release/arm')

diff --git a/release/arm/ZEDBOARD.conf b/release/arm/ZEDBOARD.conf
deleted file mode 100644
index 507117a..0000000
--- a/release/arm/ZEDBOARD.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-EMBEDDEDBUILD=1
-EMBEDDED_TARGET="arm"
-EMBEDDED_TARGET_ARCH="armv6"
-KERNEL="ZEDBOARD"
-NODOC=1
-- 
cgit v1.1


From d0610f154f234a31ee4de0b6db3c6c47f423b246 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Thu, 7 May 2015 23:49:48 +0000
Subject: Copy the rpi.dtb file to the FAT partition, preventing the
 'Unrecognized partition table' error, causing boot failure.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/RPI-B.conf | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 4715c73..6130d8c 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -30,6 +30,8 @@ arm_install_uboot() {
 	done
 	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
 		${CHROOTDIR}/${FATMOUNT}/ubldr
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi.dtb \
+		${CHROOTDIR}/${FATMOUNT}/rpi.dtb
 	echo 'loadbootscript=fatload mmc 0 0x2000000 ubldr' > \
 		${CHROOTDIR}/${FATMOUNT}/uenv.txt
 	echo 'bootscript=fdt addr 0x100;bootelf 0x2000000' >> \
-- 
cgit v1.1


From dc4500ae96a49c02e36200a53171cc2c01d8c881 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 10:39:52 +0000
Subject: Do not create the uenv.txt file for RPI-B.  It is not needed.

Submitted by:	ian
Sponsored by:	The FreeBSD Foundation
---
 release/arm/RPI-B.conf | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 6130d8c..364f155 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -32,10 +32,6 @@ arm_install_uboot() {
 		${CHROOTDIR}/${FATMOUNT}/ubldr
 	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi.dtb \
 		${CHROOTDIR}/${FATMOUNT}/rpi.dtb
-	echo 'loadbootscript=fatload mmc 0 0x2000000 ubldr' > \
-		${CHROOTDIR}/${FATMOUNT}/uenv.txt
-	echo 'bootscript=fdt addr 0x100;bootelf 0x2000000' >> \
-		${CHROOTDIR}/${FATMOUNT}/uenv.txt
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
-- 
cgit v1.1


From 684abf744f056cf740a72e9ed957b28df0661c5f Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 13:55:27 +0000
Subject: Initial commit to support building RPI2 images, based on information
 and documentation written by loos@ on the Wiki.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/RPI2.conf | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index e4b5659..1aaed77 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -9,3 +9,34 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-rpi2"
 KERNEL="RPI2"
 NODOC=1
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
+IMAGE_SIZE="1G"
+PART_SCHEME="MBR"
+FAT_SIZE="50m"
+FAT_TYPE="16"
+MD_ARGS="-x 63 -y 255"
+
+arm_install_uboot() {
+	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi2"
+	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
+		fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin"
+	FATMOUNT="${DESTDIR}/fat"
+	UFSMOUNT="${DESTDIR}/ufs"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	for _UF in ${UBOOT_FILES}; do
+		cp -p ${UBOOT_DIR}/${_UF} ${CHROOTDIR}/${FATMOUNT}/${_UF}
+	done
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
+		${CHROOTDIR}/${FATMOUNT}/ubldr
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi2.dtb \
+		${CHROOTDIR}/${FATMOUNT}/rpi2.dtb
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	umount_loop ${CHROOTDIR}/${UFSMOUNT}
+	rmdir ${CHROOTDIR}/${FATMOUNT}
+	rmdir ${CHROOTDIR}/${UFSMOUNT}
+	
+	return 0
+}
-- 
cgit v1.1


From 26e678e2ac2bb81f46b1e5c9b7496ce48cc9fe29 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 15:07:17 +0000
Subject: Initial support for building WANDBOARD-QUAD images.

Several parts of this were obtained from Crochet.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/WANDBOARD-QUAD.conf | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index 2f3ecf6..4bab788 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -8,4 +8,34 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 KERNEL="WANDBOARD-QUAD"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
+IMAGE_SIZE="1G"
+PART_SCHEME="MBR"
+FAT_SIZE="17m"
+FAT_TYPE="16 -b 16384"
+MD_ARGS="-x 63 -y 255"
 NODOC=1
+
+arm_install_uboot() {
+	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
+	UBOOT_FILES="u-boot.imx"
+	FATMOUNT="${DESTDIR}/fat"
+	UFSMOUNT="${DESTDIR}/ufs"
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+		of=/dev/${mddev} bs=512 seek=2
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
+		${CHROOTDIR}/${FATMOUNT}/ubldr
+	chroot ${CHROOTDIR} echo \
+		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
+		> ${FATMOUNT}/boot.txt
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	umount_loop ${CHROOTDIR}/${UFSMOUNT}
+	rmdir ${CHROOTDIR}/${FATMOUNT}
+	rmdir ${CHROOTDIR}/${UFSMOUNT}
+	
+	return 0
+}
-- 
cgit v1.1


From 692717cb489a40c61102d5e3681e68236cda2960 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 15:18:31 +0000
Subject: Fix FAT partition size.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/WANDBOARD-QUAD.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'release/arm')

diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index 4bab788..7039cc7 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -11,7 +11,7 @@ KERNEL="WANDBOARD-QUAD"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
-FAT_SIZE="17m"
+FAT_SIZE="50m"
 FAT_TYPE="16 -b 16384"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
-- 
cgit v1.1


From 5924ca13e565c931aa4e1458ccb527b9cf4f8aa9 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 15:22:29 +0000
Subject: Copy arm/WANDBOARD-QUAD.conf to arm/WANDBOARD-{SOLO,DUAL}.conf. Ian
 informed me a few months ago that the WANDBOARD-* kernels will eventually be
 combined into one that will work across all these boards, but for now, build
 them individually.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/WANDBOARD-SOLO.conf | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 release/arm/WANDBOARD-SOLO.conf

(limited to 'release/arm')

diff --git a/release/arm/WANDBOARD-SOLO.conf b/release/arm/WANDBOARD-SOLO.conf
new file mode 100644
index 0000000..efcca73
--- /dev/null
+++ b/release/arm/WANDBOARD-SOLO.conf
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-wandboard"
+KERNEL="WANDBOARD-SOLO"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
+IMAGE_SIZE="1G"
+PART_SCHEME="MBR"
+FAT_SIZE="50m"
+FAT_TYPE="16 -b 16384"
+MD_ARGS="-x 63 -y 255"
+NODOC=1
+
+arm_install_uboot() {
+	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
+	UBOOT_FILES="u-boot.imx"
+	FATMOUNT="${DESTDIR}/fat"
+	UFSMOUNT="${DESTDIR}/ufs"
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+		of=/dev/${mddev} bs=512 seek=2
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
+		${CHROOTDIR}/${FATMOUNT}/ubldr
+	chroot ${CHROOTDIR} echo \
+		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
+		> ${FATMOUNT}/boot.txt
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	umount_loop ${CHROOTDIR}/${UFSMOUNT}
+	rmdir ${CHROOTDIR}/${FATMOUNT}
+	rmdir ${CHROOTDIR}/${UFSMOUNT}
+	
+	return 0
+}
-- 
cgit v1.1


From cf3aaa44c31511743bbf0db00c61337f9e7c47da Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 15:23:21 +0000
Subject: Add a file missed in the previous commit.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/WANDBOARD-DUAL.conf | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 release/arm/WANDBOARD-DUAL.conf

(limited to 'release/arm')

diff --git a/release/arm/WANDBOARD-DUAL.conf b/release/arm/WANDBOARD-DUAL.conf
new file mode 100644
index 0000000..4f76852
--- /dev/null
+++ b/release/arm/WANDBOARD-DUAL.conf
@@ -0,0 +1,41 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-wandboard"
+KERNEL="WANDBOARD-DUAL"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
+IMAGE_SIZE="1G"
+PART_SCHEME="MBR"
+FAT_SIZE="50m"
+FAT_TYPE="16 -b 16384"
+MD_ARGS="-x 63 -y 255"
+NODOC=1
+
+arm_install_uboot() {
+	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
+	UBOOT_FILES="u-boot.imx"
+	FATMOUNT="${DESTDIR}/fat"
+	UFSMOUNT="${DESTDIR}/ufs"
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+		of=/dev/${mddev} bs=512 seek=2
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
+		${CHROOTDIR}/${FATMOUNT}/ubldr
+	chroot ${CHROOTDIR} echo \
+		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
+		> ${FATMOUNT}/boot.txt
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	umount_loop ${CHROOTDIR}/${UFSMOUNT}
+	rmdir ${CHROOTDIR}/${FATMOUNT}
+	rmdir ${CHROOTDIR}/${UFSMOUNT}
+	
+	return 0
+}
-- 
cgit v1.1


From 261ee6d1dc98a76217992afca99d4fecfc6bf8e0 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 16:00:06 +0000
Subject: Initial support for building the PANDABOARD image.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/PANDABOARD.conf | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 439fd37..0ea697e 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -9,3 +9,29 @@ EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
 KERNEL="PANDABOARD"
 NODOC=1
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
+IMAGE_SIZE="1G"
+PART_SCHEME="MBR"
+FAT_SIZE="2m"
+FAT_TYPE="12"
+MD_ARGS="-x 63 -y 255"
+
+arm_install_uboot() {
+	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-pandaboard"
+	FATMOUNT="${DESTDIR}/fat"
+	UFSMOUNT="${DESTDIR}/ufs"
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	cp -p ${UBOOT_DIR}/MLO ${CHROOTDIR}/${FATMOUNT}/MLO
+	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
+		${CHROOTDIR}/${FATMOUNT}/ubldr
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	umount_loop ${CHROOTDIR}/${UFSMOUNT}
+	rmdir ${CHROOTDIR}/${FATMOUNT}
+	rmdir ${CHROOTDIR}/${UFSMOUNT}
+	
+	return 0
+}
-- 
cgit v1.1


From d92941fb7d88be0108c6dc6807273bd83049ead9 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 16:37:57 +0000
Subject: Fix the starting block of the partition.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/WANDBOARD-DUAL.conf | 4 ++--
 release/arm/WANDBOARD-QUAD.conf | 4 ++--
 release/arm/WANDBOARD-SOLO.conf | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/WANDBOARD-DUAL.conf b/release/arm/WANDBOARD-DUAL.conf
index 4f76852..ea87e17 100644
--- a/release/arm/WANDBOARD-DUAL.conf
+++ b/release/arm/WANDBOARD-DUAL.conf
@@ -11,8 +11,8 @@ KERNEL="WANDBOARD-DUAL"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
-FAT_SIZE="50m"
-FAT_TYPE="16 -b 16384"
+FAT_SIZE="50m -b 16384"
+FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
 
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index 7039cc7..220fa81 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -11,8 +11,8 @@ KERNEL="WANDBOARD-QUAD"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
-FAT_SIZE="50m"
-FAT_TYPE="16 -b 16384"
+FAT_SIZE="50m -b 16384"
+FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
 
diff --git a/release/arm/WANDBOARD-SOLO.conf b/release/arm/WANDBOARD-SOLO.conf
index efcca73..72c4161 100644
--- a/release/arm/WANDBOARD-SOLO.conf
+++ b/release/arm/WANDBOARD-SOLO.conf
@@ -11,8 +11,8 @@ KERNEL="WANDBOARD-SOLO"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
-FAT_SIZE="50m"
-FAT_TYPE="16 -b 16384"
+FAT_SIZE="50m -b 16384"
+FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
 
-- 
cgit v1.1


From 53b50c1a769415fa150957dce8b6a53d5bee3ea5 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 16:41:21 +0000
Subject: Touch '/firstboot' so the growfs rc(8) script runs.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf     | 1 +
 release/arm/PANDABOARD.conf     | 1 +
 release/arm/RPI-B.conf          | 1 +
 release/arm/RPI2.conf           | 1 +
 release/arm/WANDBOARD-DUAL.conf | 1 +
 release/arm/WANDBOARD-QUAD.conf | 1 +
 release/arm/WANDBOARD-SOLO.conf | 1 +
 7 files changed, 7 insertions(+)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index add96e1..f5d8189 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -27,6 +27,7 @@ arm_install_uboot() {
 	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
 	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
 		${CHROOTDIR}/${FATMOUNT}/ubldr
+	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 0ea697e..45b7085 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -27,6 +27,7 @@ arm_install_uboot() {
 	cp -p ${UBOOT_DIR}/u-boot.img ${CHROOTDIR}/${FATMOUNT}/u-boot.img
 	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
 		${CHROOTDIR}/${FATMOUNT}/ubldr
+	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 364f155..5610237 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -32,6 +32,7 @@ arm_install_uboot() {
 		${CHROOTDIR}/${FATMOUNT}/ubldr
 	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi.dtb \
 		${CHROOTDIR}/${FATMOUNT}/rpi.dtb
+	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 1aaed77..7de7188 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -32,6 +32,7 @@ arm_install_uboot() {
 		${CHROOTDIR}/${FATMOUNT}/ubldr
 	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/dtb/rpi2.dtb \
 		${CHROOTDIR}/${FATMOUNT}/rpi2.dtb
+	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
diff --git a/release/arm/WANDBOARD-DUAL.conf b/release/arm/WANDBOARD-DUAL.conf
index ea87e17..e69dec3 100644
--- a/release/arm/WANDBOARD-DUAL.conf
+++ b/release/arm/WANDBOARD-DUAL.conf
@@ -31,6 +31,7 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} echo \
 		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
 		> ${FATMOUNT}/boot.txt
+	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index 220fa81..0ddf3d3 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -31,6 +31,7 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} echo \
 		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
 		> ${FATMOUNT}/boot.txt
+	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
diff --git a/release/arm/WANDBOARD-SOLO.conf b/release/arm/WANDBOARD-SOLO.conf
index 72c4161..b7b035e 100644
--- a/release/arm/WANDBOARD-SOLO.conf
+++ b/release/arm/WANDBOARD-SOLO.conf
@@ -31,6 +31,7 @@ arm_install_uboot() {
 	chroot ${CHROOTDIR} echo \
 		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
 		> ${FATMOUNT}/boot.txt
+	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
 	sync
 	umount_loop ${CHROOTDIR}/${FATMOUNT}
 	umount_loop ${CHROOTDIR}/${UFSMOUNT}
-- 
cgit v1.1


From eff85709da377431239a785b14d3fef1ffcb6494 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 17:53:44 +0000
Subject: Fix path to the u-boot.imx file, which is relative to the root of the
 chroot environment.

Sponsored by:	The FreeBSD Foundation
---
 release/arm/WANDBOARD-DUAL.conf | 2 +-
 release/arm/WANDBOARD-QUAD.conf | 2 +-
 release/arm/WANDBOARD-SOLO.conf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/WANDBOARD-DUAL.conf b/release/arm/WANDBOARD-DUAL.conf
index e69dec3..c20a4a9 100644
--- a/release/arm/WANDBOARD-DUAL.conf
+++ b/release/arm/WANDBOARD-DUAL.conf
@@ -21,7 +21,7 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.imx"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index 0ddf3d3..d6de53d 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -21,7 +21,7 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.imx"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
diff --git a/release/arm/WANDBOARD-SOLO.conf b/release/arm/WANDBOARD-SOLO.conf
index b7b035e..bdc2ef9 100644
--- a/release/arm/WANDBOARD-SOLO.conf
+++ b/release/arm/WANDBOARD-SOLO.conf
@@ -21,7 +21,7 @@ arm_install_uboot() {
 	UBOOT_FILES="u-boot.imx"
 	FATMOUNT="${DESTDIR}/fat"
 	UFSMOUNT="${DESTDIR}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR}/${UBOOT_FILES} \
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-- 
cgit v1.1


From 83dbcdd67987795b0a43699b57a432b8e580b6a1 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 18:45:32 +0000
Subject: Strip the KERNEL from the mount paths, working around the following
 error:

 root@releng2:/ # mount_msdosfs /dev/md5s1 /usr/obj/usr/src/release/WANDBOARD-QUAD/fat
 mount_msdosfs: /dev/md5s1: File name too long

Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf     | 4 ++--
 release/arm/PANDABOARD.conf     | 4 ++--
 release/arm/RPI-B.conf          | 4 ++--
 release/arm/RPI2.conf           | 4 ++--
 release/arm/WANDBOARD-DUAL.conf | 4 ++--
 release/arm/WANDBOARD-QUAD.conf | 4 ++--
 release/arm/WANDBOARD-SOLO.conf | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'release/arm')

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index f5d8189..87d2ffe 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -18,8 +18,8 @@ NODOC=1
 
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-beaglebone"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 45b7085..28a4639 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -18,8 +18,8 @@ MD_ARGS="-x 63 -y 255"
 
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-pandaboard"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
diff --git a/release/arm/RPI-B.conf b/release/arm/RPI-B.conf
index 5610237..db3c102 100644
--- a/release/arm/RPI-B.conf
+++ b/release/arm/RPI-B.conf
@@ -20,8 +20,8 @@ arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi"
 	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
 		start.elf start_cd.elf u-boot.img"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 7de7188..aadd458 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -20,8 +20,8 @@ arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-rpi2"
 	UBOOT_FILES="bootcode.bin config.txt fixup.dat fixup_cd.dat \
 		fixup_x.dat start.elf start_cd.elf start_x.elf u-boot.bin"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
 	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
 	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
diff --git a/release/arm/WANDBOARD-DUAL.conf b/release/arm/WANDBOARD-DUAL.conf
index c20a4a9..614a142 100644
--- a/release/arm/WANDBOARD-DUAL.conf
+++ b/release/arm/WANDBOARD-DUAL.conf
@@ -19,8 +19,8 @@ NODOC=1
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
index d6de53d..a811aaa 100644
--- a/release/arm/WANDBOARD-QUAD.conf
+++ b/release/arm/WANDBOARD-QUAD.conf
@@ -19,8 +19,8 @@ NODOC=1
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
diff --git a/release/arm/WANDBOARD-SOLO.conf b/release/arm/WANDBOARD-SOLO.conf
index bdc2ef9..2878c19 100644
--- a/release/arm/WANDBOARD-SOLO.conf
+++ b/release/arm/WANDBOARD-SOLO.conf
@@ -19,8 +19,8 @@ NODOC=1
 arm_install_uboot() {
 	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
 	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR}/fat"
-	UFSMOUNT="${DESTDIR}/ufs"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
 	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
 		of=/dev/${mddev} bs=512 seek=2
 	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-- 
cgit v1.1


From 6c40325758f4666792da25f1eec396c7e6a3c575 Mon Sep 17 00:00:00 2001
From: gjb <gjb@FreeBSD.org>
Date: Fri, 8 May 2015 18:55:09 +0000
Subject: Use the IMX6 kernel configuration for the WANDBOARD build, since it
 supports all of these board variants.

While here, remove the WANDBOARD-{QUAD,SOLO,DUAL} kernel
configuration files.

Discussed with:	ian
Sponsored by:	The FreeBSD Foundation
---
 release/arm/WANDBOARD-DUAL.conf | 42 -----------------------------------------
 release/arm/WANDBOARD-QUAD.conf | 42 -----------------------------------------
 release/arm/WANDBOARD-SOLO.conf | 42 -----------------------------------------
 release/arm/WANDBOARD.conf      | 42 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 42 insertions(+), 126 deletions(-)
 delete mode 100644 release/arm/WANDBOARD-DUAL.conf
 delete mode 100644 release/arm/WANDBOARD-QUAD.conf
 delete mode 100644 release/arm/WANDBOARD-SOLO.conf
 create mode 100644 release/arm/WANDBOARD.conf

(limited to 'release/arm')

diff --git a/release/arm/WANDBOARD-DUAL.conf b/release/arm/WANDBOARD-DUAL.conf
deleted file mode 100644
index 614a142..0000000
--- a/release/arm/WANDBOARD-DUAL.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-EMBEDDEDBUILD=1
-EMBEDDED_TARGET="arm"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDEDPORTS="sysutils/u-boot-wandboard"
-KERNEL="WANDBOARD-DUAL"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
-IMAGE_SIZE="1G"
-PART_SCHEME="MBR"
-FAT_SIZE="50m -b 16384"
-FAT_TYPE="16"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-
-arm_install_uboot() {
-	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
-	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
-	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=512 seek=2
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
-		${CHROOTDIR}/${FATMOUNT}/ubldr
-	chroot ${CHROOTDIR} echo \
-		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
-		> ${FATMOUNT}/boot.txt
-	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
-	sync
-	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
-	rmdir ${CHROOTDIR}/${FATMOUNT}
-	rmdir ${CHROOTDIR}/${UFSMOUNT}
-	
-	return 0
-}
diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
deleted file mode 100644
index a811aaa..0000000
--- a/release/arm/WANDBOARD-QUAD.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-EMBEDDEDBUILD=1
-EMBEDDED_TARGET="arm"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDEDPORTS="sysutils/u-boot-wandboard"
-KERNEL="WANDBOARD-QUAD"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
-IMAGE_SIZE="1G"
-PART_SCHEME="MBR"
-FAT_SIZE="50m -b 16384"
-FAT_TYPE="16"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-
-arm_install_uboot() {
-	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
-	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
-	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=512 seek=2
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
-		${CHROOTDIR}/${FATMOUNT}/ubldr
-	chroot ${CHROOTDIR} echo \
-		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
-		> ${FATMOUNT}/boot.txt
-	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
-	sync
-	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
-	rmdir ${CHROOTDIR}/${FATMOUNT}
-	rmdir ${CHROOTDIR}/${UFSMOUNT}
-	
-	return 0
-}
diff --git a/release/arm/WANDBOARD-SOLO.conf b/release/arm/WANDBOARD-SOLO.conf
deleted file mode 100644
index 2878c19..0000000
--- a/release/arm/WANDBOARD-SOLO.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-EMBEDDEDBUILD=1
-EMBEDDED_TARGET="arm"
-EMBEDDED_TARGET_ARCH="armv6"
-EMBEDDEDPORTS="sysutils/u-boot-wandboard"
-KERNEL="WANDBOARD-SOLO"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
-IMAGE_SIZE="1G"
-PART_SCHEME="MBR"
-FAT_SIZE="50m -b 16384"
-FAT_TYPE="16"
-MD_ARGS="-x 63 -y 255"
-NODOC=1
-
-arm_install_uboot() {
-	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
-	UBOOT_FILES="u-boot.imx"
-	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
-	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
-	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
-		of=/dev/${mddev} bs=512 seek=2
-	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
-	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
-	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
-	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
-		${CHROOTDIR}/${FATMOUNT}/ubldr
-	chroot ${CHROOTDIR} echo \
-		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
-		> ${FATMOUNT}/boot.txt
-	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
-	sync
-	umount_loop ${CHROOTDIR}/${FATMOUNT}
-	umount_loop ${CHROOTDIR}/${UFSMOUNT}
-	rmdir ${CHROOTDIR}/${FATMOUNT}
-	rmdir ${CHROOTDIR}/${UFSMOUNT}
-	
-	return 0
-}
diff --git a/release/arm/WANDBOARD.conf b/release/arm/WANDBOARD.conf
new file mode 100644
index 0000000..63614d7
--- /dev/null
+++ b/release/arm/WANDBOARD.conf
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-wandboard"
+KERNEL="IMX6"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
+IMAGE_SIZE="1G"
+PART_SCHEME="MBR"
+FAT_SIZE="50m -b 16384"
+FAT_TYPE="16"
+MD_ARGS="-x 63 -y 255"
+NODOC=1
+
+arm_install_uboot() {
+	UBOOT_DIR="${CHROOTDIR}/usr/local/share/u-boot/u-boot-wandboard"
+	UBOOT_FILES="u-boot.imx"
+	FATMOUNT="${DESTDIR##${KERNEL}}/fat"
+	UFSMOUNT="${DESTDIR##${KERNEL}}/ufs"
+	chroot ${CHROOTDIR} dd if=${UBOOT_DIR##${CHROOTDIR}}/${UBOOT_FILES} \
+		of=/dev/${mddev} bs=512 seek=2
+	chroot ${CHROOTDIR} mkdir -p "${FATMOUNT}" "${UFSMOUNT}"
+	chroot ${CHROOTDIR} mount_msdosfs /dev/${mddev}s1 ${FATMOUNT}
+	chroot ${CHROOTDIR} mount /dev/${mddev}s2a ${UFSMOUNT}
+	cp -p ${CHROOTDIR}/${UFSMOUNT}/boot/ubldr \
+		${CHROOTDIR}/${FATMOUNT}/ubldr
+	chroot ${CHROOTDIR} echo \
+		'setenv fdt_file wandboard-quad.dtb; fatload mmc 0:1 11000000 ubldr; bootelf 11000000;' \
+		> ${FATMOUNT}/boot.txt
+	touch ${CHROOTDIR}/${UFSMOUNT}/firstboot
+	sync
+	umount_loop ${CHROOTDIR}/${FATMOUNT}
+	umount_loop ${CHROOTDIR}/${UFSMOUNT}
+	rmdir ${CHROOTDIR}/${FATMOUNT}
+	rmdir ${CHROOTDIR}/${UFSMOUNT}
+	
+	return 0
+}
-- 
cgit v1.1