Index: head/release/arm/BEAGLEBONE.conf
===================================================================
--- head/release/arm/BEAGLEBONE.conf
+++ head/release/arm/BEAGLEBONE.conf
@@ -7,7 +7,7 @@
 EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-beaglebone"
-KERNEL="BEAGLEBONE"
+KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 IMAGE_SIZE="2560M"
 PART_SCHEME="MBR"
@@ -15,6 +15,7 @@
 FAT_TYPE="12"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+export BOARDNAME="BEAGLEBONE"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-beaglebone"
Index: head/release/arm/CUBIEBOARD.conf
===================================================================
--- head/release/arm/CUBIEBOARD.conf
+++ head/release/arm/CUBIEBOARD.conf
@@ -7,7 +7,7 @@
 EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-cubieboard"
-KERNEL="ALLWINNER_UP"
+KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="2560M"
 PART_SCHEME="MBR"
@@ -15,6 +15,7 @@
 FAT_TYPE="16"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+export BOARDNAME="CUBIEBOARD"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-cubieboard"
Index: head/release/arm/PANDABOARD.conf
===================================================================
--- head/release/arm/PANDABOARD.conf
+++ head/release/arm/PANDABOARD.conf
@@ -7,7 +7,7 @@
 EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv7"
 EMBEDDEDPORTS="sysutils/u-boot-pandaboard"
-KERNEL="PANDABOARD"
+KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x88000000"
 IMAGE_SIZE="2560M"
 PART_SCHEME="MBR"
@@ -15,6 +15,7 @@
 FAT_TYPE="12"
 MD_ARGS="-x 63 -y 255"
 NODOC=1
+export BOARDNAME="PANDABOARD"
 
 arm_install_uboot() {
 	UBOOT_DIR="/usr/local/share/u-boot/u-boot-pandaboard"