MFC r283673, r283674:

 r283673:
  Sort configuration options for consistency with other boards.

 r283674:
  Export 'BOARDNAME' when differs from the KERNCONF.

Sponsored by:	The FreeBSD Foundation

3 files changed, 3 insertions, 2 deletions

diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index 30d0225..9910aef 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -8,13 +8,13 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
 KERNEL="PANDABOARD"
-NODOC=1
 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-pandaboard"
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 8d23f56..4e7d59c 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -9,13 +9,13 @@ EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-rpi2"
 KERNEL="RPI2"
-NODOC=1
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
 FAT_SIZE="50m"
 FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
+NODOC=1
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-rpi2"
diff --git a/release/arm/WANDBOARD.conf b/release/arm/WANDBOARD.conf
index 51f8a28..cd2d069 100644
--- a/release/arm/WANDBOARD.conf
+++ b/release/arm/WANDBOARD.conf
@@ -16,6 +16,7 @@ FAT_SIZE="50m -b 16384"
 FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+export BOARDNAME="WANDBOARD"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-wandboard"