3c3
< # $FreeBSD: head/release/arm/BEAGLEBONE.conf 282515 2015-05-05 21:08:50Z gjb $
---
> # $FreeBSD: head/release/arm/BEAGLEBONE.conf 282693 2015-05-09 21:08:12Z gjb $
6,16c6,17
< # 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"
---
> EMBEDDEDBUILD=1
> 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"
> FAT_TYPE="12"
> MD_ARGS="-x 63 -y 255"
> NODOC=1
18,23c19,36
< # Build chroot configuration
< load_chroot_env() {
< # Avoid collision with TARGET and XDEV.
< unset XDEV XDEV_ARCH KERNEL
< export TARGET="amd64"
< export TARGET_ARCH="amd64"
---
> arm_install_uboot() {
> UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
> 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}
> chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
> chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
> chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
> chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
> sync
> umount_loop ${CHROOTDIR}/${FATMOUNT}
> umount_loop ${CHROOTDIR}/${UFSMOUNT}
> chroot ${CHROOTDIR} rmdir ${FATMOUNT}
> chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
>
> return 0
25,38d37
<
< # 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"
< }
< # $FreeBSD: head/release/arm/BEAGLEBONE.conf 282515 2015-05-05 21:08:50Z gjb $
---
> # $FreeBSD: head/release/arm/BEAGLEBONE.conf 282693 2015-05-09 21:08:12Z gjb $
6,16c6,17
< # 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"
---
> EMBEDDEDBUILD=1
> 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"
> FAT_TYPE="12"
> MD_ARGS="-x 63 -y 255"
> NODOC=1
18,23c19,36
< # Build chroot configuration
< load_chroot_env() {
< # Avoid collision with TARGET and XDEV.
< unset XDEV XDEV_ARCH KERNEL
< export TARGET="amd64"
< export TARGET_ARCH="amd64"
---
> arm_install_uboot() {
> UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
> 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}
> chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/MLO ${FATMOUNT}/MLO
> chroot ${CHROOTDIR} cp -p ${UBOOT_DIR}/u-boot.img ${FATMOUNT}/u-boot.img
> chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
> chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
> sync
> umount_loop ${CHROOTDIR}/${FATMOUNT}
> umount_loop ${CHROOTDIR}/${UFSMOUNT}
> chroot ${CHROOTDIR} rmdir ${FATMOUNT}
> chroot ${CHROOTDIR} rmdir ${UFSMOUNT}
>
> return 0
25,38d37
<
< # 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"
< }