From fd3962a994b2f477d3e81fa7083f6b3d4e666df5 Mon Sep 17 00:00:00 2001
From: Trevor Woerner <twoerner@gmail.com>
Date: Fri, 26 May 2017 15:18:42 -0400
Subject: [PATCH] wandboard: use-mainline-bsp default kernel choice

Allow the "use-mainline-bsp" MACHINEOVERRIDES to toggle between the
linux-wandboard and linux-fslc kernels for the wandboard's suggested
kernel choice.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 conf/machine/wandboard.conf | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/conf/machine/wandboard.conf b/conf/machine/wandboard.conf
index ad8ebb7..506173f 100644
--- a/conf/machine/wandboard.conf
+++ b/conf/machine/wandboard.conf
@@ -17,13 +17,21 @@ UBOOT_MACHINE = "wandboard_config"
 UBOOT_EXTLINUX = "1"
 UBOOT_EXTLINUX_ROOT = "root=PARTUUID=${uuid}"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-wandboard"
+WANDBOARD_DEFAULT_KERNEL = "linux-wandboard"
+WANDBOARD_DEFAULT_KERNEL_use-mainline-bsp = "linux-fslc"
+PREFERRED_PROVIDER_virtual/kernel ?= "${WANDBOARD_DEFAULT_KERNEL}"
 KERNEL_DEVICETREE = " \
     imx6dl-wandboard-revb1.dtb \
     imx6dl-wandboard-revc1.dtb \
     imx6q-wandboard-revb1.dtb \
     imx6q-wandboard-revc1.dtb \
 "
+KERNEL_DEVICETREE_use-mainline-bsp = " \
+    imx6dl-wandboard.dtb \
+    imx6dl-wandboard-revb1.dtb \
+    imx6q-wandboard.dtb \
+    imx6q-wandboard-revb1.dtb \
+"
 
 KERNEL_IMAGETYPE = "zImage"