Author: gjb
Date: Tue May 5 21:08:50 2015
New Revision: 282515
URL: https://svnweb.freebsd.org/changeset/base/282515
Log:
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
Modified:
head/release/arm/BEAGLEBONE.conf
head/release/arm/release.sh
head/release/tools/arm/crochet-BEAGLEBONE.conf
Modified: head/release/arm/BEAGLEBONE.conf
==============================================================================
--- head/release/arm/BEAGLEBONE.conf Tue May 5 20:59:43 2015
(r282514)
+++ head/release/arm/BEAGLEBONE.conf Tue May 5 21:08:50 2015
(r282515)
@@ -13,6 +13,7 @@ export WORLD_FLAGS="-j $(sysctl -n hw.nc
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() {
Modified: head/release/arm/release.sh
==============================================================================
--- head/release/arm/release.sh Tue May 5 20:59:43 2015 (r282514)
+++ head/release/arm/release.sh Tue May 5 21:08:50 2015 (r282515)
@@ -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"
Modified: head/release/tools/arm/crochet-BEAGLEBONE.conf
==============================================================================
--- head/release/tools/arm/crochet-BEAGLEBONE.conf Tue May 5 20:59:43
2015 (r282514)
+++ head/release/tools/arm/crochet-BEAGLEBONE.conf Tue May 5 21:08:50
2015 (r282515)
@@ -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
+}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
