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

6 files changed, 1 insertions, 169 deletions

diff --git a/release/arm/WANDBOARD-QUAD.conf b/release/arm/WANDBOARD-QUAD.conf
deleted file mode 100644
index a811aaa4ca7d..000000000000
--- 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 2878c197c8bf..000000000000
--- 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-DUAL.conf b/release/arm/WANDBOARD.conf
index 614a142edd3f..63614d7cf083 100644
--- a/release/arm/WANDBOARD-DUAL.conf
+++ b/release/arm/WANDBOARD.conf
@@ -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"
diff --git a/sys/arm/conf/WANDBOARD-DUAL b/sys/arm/conf/WANDBOARD-DUAL
deleted file mode 100644
index 66e2535a4b2b..000000000000
--- a/sys/arm/conf/WANDBOARD-DUAL
+++ /dev/null
@@ -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
-
diff --git a/sys/arm/conf/WANDBOARD-QUAD b/sys/arm/conf/WANDBOARD-QUAD
deleted file mode 100644
index 830a445fc99c..000000000000
--- a/sys/arm/conf/WANDBOARD-QUAD
+++ /dev/null
@@ -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
-
diff --git a/sys/arm/conf/WANDBOARD-SOLO b/sys/arm/conf/WANDBOARD-SOLO
deleted file mode 100644
index ad56365c6d06..000000000000
--- a/sys/arm/conf/WANDBOARD-SOLO
+++ /dev/null
@@ -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
-