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"