From: Otavio Salvador <otavio@ossystems.com.br>
Date: Wed, 17 Jun 2015 14:54:25 +0000 (-0300)
Subject: imx-base.inc: Use linux-fslc-mx6 for all i.MX6 by default
X-Git-Tag: 2.1~558
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=21c8b02665f9f2b175dcd73a4b35d932991ecee5;p=meta-freescale.git

imx-base.inc: Use linux-fslc-mx6 for all i.MX6 by default

The linux-fslc-mx6 recipe provides the FSL Community's i.MX6 Linux
which is a Linux kernel based on Freescale GA release, used by FSL
Community BSP in order to provide support for i.MX6 based platforms.

Every machine can override this value but by default the
linux-fslc-mx6 is now used.

Change-Id: Ia80ad8b9a0a8347197a64062513e18ca5e204a3a
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index fc50ee13..f64ba6b0 100644
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -109,8 +109,11 @@ PREFERRED_PROVIDER_virtual/libgl_mx6sx ?= "imx-gpu-viv"
 PREFERRED_PROVIDER_virtual/libgl_mx6sl ?= "mesa"
 PREFERRED_PROVIDER_virtual/libg2d_mx6 ?= "imx-gpu-viv"
 
-PREFERRED_PROVIDER_virtual/kernel ??= "linux-imx"
-PREFERRED_PROVIDER_virtual/kernel_mx3 ?= "linux-fslc"
+# Handle default kernel
+IMX_DEFAULT_KERNEL = "linux-imx"
+IMX_DEFAULT_KERNEL_mx3 = "linux-fslc"
+IMX_DEFAULT_KERNEL_mx6 = "linux-fslc-mx6"
+PREFERRED_PROVIDER_virtual/kernel ??= "${IMX_DEFAULT_KERNEL}"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
 IMAGE_FSTYPES ?= "tar.bz2 ext3 sdcard"