From 62d028dcac1a4f94f8c1504df35ec89b5bce3f69 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Mon, 9 Oct 2017 17:12:02 +0000
Subject: [PATCH] Switch BEAGLEBONE, CUBIEBOARD, and PANDABOARD to use the
 GENERIC kernel configuration.

Submitted by:		andrew
Differential Revision:	https://reviews.freebsd.org/D12484
Sponsored by:	The FreeBSD Foundation
---
 release/arm/BEAGLEBONE.conf | 3 ++-
 release/arm/CUBIEBOARD.conf | 3 ++-
 release/arm/PANDABOARD.conf | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/release/arm/BEAGLEBONE.conf b/release/arm/BEAGLEBONE.conf
index d4ff59385f28..5cc27f674603 100644
--- a/release/arm/BEAGLEBONE.conf
+++ b/release/arm/BEAGLEBONE.conf
@@ -7,7 +7,7 @@ EMBEDDEDBUILD=1
 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_SIZE="2m"
 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"
diff --git a/release/arm/CUBIEBOARD.conf b/release/arm/CUBIEBOARD.conf
index 3f4b2148c00d..8b4523688faa 100644
--- a/release/arm/CUBIEBOARD.conf
+++ b/release/arm/CUBIEBOARD.conf
@@ -7,7 +7,7 @@ EMBEDDEDBUILD=1
 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_SIZE="32m -b 1m"
 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"
diff --git a/release/arm/PANDABOARD.conf b/release/arm/PANDABOARD.conf
index c8d35e98923e..35a88f8868d6 100644
--- a/release/arm/PANDABOARD.conf
+++ b/release/arm/PANDABOARD.conf
@@ -7,7 +7,7 @@ EMBEDDEDBUILD=1
 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_SIZE="2m"
 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"