From 0fd28b2c963607084c1ee96354810e31cea4ff99 Mon Sep 17 00:00:00 2001
From: Andrew Turner <andrew@FreeBSD.org>
Date: Wed, 12 Oct 2016 15:29:22 +0000
Subject: [PATCH] Use the armv6 GENERIC kernel in the release images on
 hardware this kernel config supports.

Approved by:	gjb
Sponsored by:	ABT Systems Ltd
Differential Revision:	https://reviews.freebsd.org/D8147
---
 release/arm/BANANAPI.conf    | 2 +-
 release/arm/CUBIEBOARD2.conf | 2 +-
 release/arm/RPI2.conf        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/release/arm/BANANAPI.conf b/release/arm/BANANAPI.conf
index 5da9f384286..53ccedb54ac 100644
--- a/release/arm/BANANAPI.conf
+++ b/release/arm/BANANAPI.conf
@@ -7,7 +7,7 @@ EMBEDDEDBUILD=1
 EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-bananapi"
-KERNEL="ALLWINNER"
+KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
diff --git a/release/arm/CUBIEBOARD2.conf b/release/arm/CUBIEBOARD2.conf
index e7cfab669cf..acb10f6f906 100644
--- a/release/arm/CUBIEBOARD2.conf
+++ b/release/arm/CUBIEBOARD2.conf
@@ -7,7 +7,7 @@ EMBEDDEDBUILD=1
 EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-cubieboard2"
-KERNEL="ALLWINNER"
+KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x42000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"
diff --git a/release/arm/RPI2.conf b/release/arm/RPI2.conf
index 886a5aa1ae9..9d5a6423585 100644
--- a/release/arm/RPI2.conf
+++ b/release/arm/RPI2.conf
@@ -7,7 +7,7 @@ EMBEDDEDBUILD=1
 EMBEDDED_TARGET="arm"
 EMBEDDED_TARGET_ARCH="armv6"
 EMBEDDEDPORTS="sysutils/u-boot-rpi2"
-KERNEL="RPI2"
+KERNEL="GENERIC"
 WORLD_FLAGS="${WORLD_FLAGS} UBLDR_LOADADDR=0x2000000"
 IMAGE_SIZE="1G"
 PART_SCHEME="MBR"