svn commit: r284156 - stable/10/release/arm

[Glen Barber]

Author: gjb
Date: Mon Jun  8 15:24:24 2015
New Revision: 284156
URL: https://svnweb.freebsd.org/changeset/base/284156

Log:
  MFC r283920, r283991, r283992, r284102:
  
  r283920:
   Add a configuration file to support the Cubox/Hummingboard SoC.
  
  r283991:
   Add initial support for building images for the Duovero Gumstix
   board.
  
  r283992:
   Fix a whitespace nit.
  
  r284102:
   Set the correct UBLDR_LOADADDR for the Wandboard and
   Cubox/Hummingboard images.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  stable/10/release/arm/CUBOX-HUMMINGBOARD.conf
     - copied, changed from r283920, head/release/arm/CUBOX-HUMMINGBOARD.conf
  stable/10/release/arm/GUMSTIX.conf
     - copied unchanged from r283991, head/release/arm/GUMSTIX.conf
Modified:
  stable/10/release/arm/BEAGLEBONE.conf
  stable/10/release/arm/WANDBOARD.conf
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/arm/BEAGLEBONE.conf
==============================================================================
--- stable/10/release/arm/BEAGLEBONE.conf	Mon Jun  8 15:12:47 2015	(r284155)
+++ stable/10/release/arm/BEAGLEBONE.conf	Mon Jun  8 15:24:24 2015	(r284156)
@@ -23,7 +23,7 @@ arm_install_uboot() {
 	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}/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

Copied and modified: stable/10/release/arm/CUBOX-HUMMINGBOARD.conf (from r283920, head/release/arm/CUBOX-HUMMINGBOARD.conf)
==============================================================================
--- head/release/arm/CUBOX-HUMMINGBOARD.conf	Tue Jun  2 17:03:31 2015	(r283920, copy source)
+++ stable/10/release/arm/CUBOX-HUMMINGBOARD.conf	Mon Jun  8 15:24:24 2015	(r284156)
@@ -8,7 +8,7 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-cubox-hummingboard"
 KERNEL="IMX6"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"

Copied: stable/10/release/arm/GUMSTIX.conf (from r283991, head/release/arm/GUMSTIX.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/release/arm/GUMSTIX.conf	Mon Jun  8 15:24:24 2015	(r284156, copy of r283991, head/release/arm/GUMSTIX.conf)
@@ -0,0 +1,37 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+EMBEDDEDBUILD=1
+EMBEDDED_TARGET="arm"
+EMBEDDED_TARGET_ARCH="armv6"
+EMBEDDEDPORTS="sysutils/u-boot-duovero"
+KERNEL="GUMSTIX"
+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
+
+arm_install_uboot() {
+	UBOOT_DIR="/usr/local/share/u-boot/u-boot-duovero"
+	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
+}

Modified: stable/10/release/arm/WANDBOARD.conf
==============================================================================
--- stable/10/release/arm/WANDBOARD.conf	Mon Jun  8 15:12:47 2015	(r284155)
+++ stable/10/release/arm/WANDBOARD.conf	Mon Jun  8 15:24:24 2015	(r284156)
@@ -9,7 +9,7 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-wandboard"
 KERNEL="IMX6"
-WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
+WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x12000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
 FAT_SIZE="50m -b 16384"