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
This commit is contained in:
Glen Barber 2015-05-08 18:55:09 +00:00
parent 4194ca40a5
commit c083dc0321
6 changed files with 1 additions and 169 deletions

View File

@ -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
}

View File

@ -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
}

View File

@ -7,7 +7,7 @@ EMBEDDEDBUILD=1
EMBEDDED_TARGET="arm"
EMBEDDED_TARGET_ARCH="armv6"
EMBEDDEDPORTS="sysutils/u-boot-wandboard"
KERNEL="WANDBOARD-DUAL"
KERNEL="IMX6"
WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x11000000"
IMAGE_SIZE="1G"
PART_SCHEME="MBR"

View File

@ -1,28 +0,0 @@
# Kernel configuration for Wandboard-Dual
#
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
#
# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
# device lines is also present in the ../../conf/NOTES and NOTES files.
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
# $FreeBSD$
#NO_UNIVERSE
include "IMX6"
ident WANDBOARD-DUAL
# Flattened Device Tree
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=wandboard-dual.dts

View File

@ -1,28 +0,0 @@
# Kernel configuration for Wandboard-Quad
#
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
#
# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
# device lines is also present in the ../../conf/NOTES and NOTES files.
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
# $FreeBSD$
#NO_UNIVERSE
include "IMX6"
ident WANDBOARD-QUAD
# Flattened Device Tree
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=wandboard-quad.dts

View File

@ -1,28 +0,0 @@
# Kernel configuration for Wandboard-Solo
#
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
#
# http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
# device lines is also present in the ../../conf/NOTES and NOTES files.
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
# $FreeBSD$
include "IMX6"
ident WANDBOARD-SOLO
nooptions SMP
# Flattened Device Tree
options FDT_DTB_STATIC
makeoptions FDT_DTS_FILE=wandboard-solo.dts