From: Otavio Salvador <otavio@ossystems.com.br>
Date: Sun, 6 Jan 2013 21:16:20 +0000 (-0200)
Subject: imx-base.inc: Centralize the preferred kernel for i.MX3X SoCs
X-Git-Tag: 2.1~1559
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d8e3a6c3f91694d07046fb392a9e0b537e6352f3;p=meta-freescale.git

imx-base.inc: Centralize the preferred kernel for i.MX3X SoCs

The preferred kernel for i.MX3X SoCs are the same so we should set it
in imx-base.inc. The previous setting were not working as the board
files were using weak setting and the default (linux-imx) were being
used by mistake.

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

diff --git a/meta-fsl-arm/conf/machine/imx31pdk.conf b/meta-fsl-arm/conf/machine/imx31pdk.conf
index 5e3fd23a..0bb7aa75 100644
--- a/meta-fsl-arm/conf/machine/imx31pdk.conf
+++ b/meta-fsl-arm/conf/machine/imx31pdk.conf
@@ -10,8 +10,6 @@ SOC_FAMILY = "mx31:mx3"
 
 GUI_MACHINE_CLASS = "smallscreen"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
-
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"
diff --git a/meta-fsl-arm/conf/machine/imx35pdk.conf b/meta-fsl-arm/conf/machine/imx35pdk.conf
index 997d2618..29d1c6a4 100755
--- a/meta-fsl-arm/conf/machine/imx35pdk.conf
+++ b/meta-fsl-arm/conf/machine/imx35pdk.conf
@@ -8,8 +8,6 @@ require conf/machine/include/tune-arm1136jf-s.inc
 
 SOC_FAMILY = "mx35:mx3"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline"
-
 UBOOT_ENTRYPOINT = "0x80008000"
 UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_MACHINE = "mx35pdk_config"
diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index 10d67ac2..455d61f7 100644
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -58,6 +58,8 @@ PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-x11-bin-mx51"
 PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51"
 PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-x11-bin-mx51"
 
+PREFERRED_PROVIDER_virtual/kernel_mx3 = "linux-fslc"
+
 EXTRA_IMAGEDEPENDS = "u-boot"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"