From 90e1ad6d70f14f6018b511fb957bab33f53e101b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 6 Jan 2013 19:16:20 -0200 Subject: 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 --- conf/machine/imx31pdk.conf | 2 -- conf/machine/imx35pdk.conf | 2 -- conf/machine/include/imx-base.inc | 2 ++ 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conf/machine/imx31pdk.conf b/conf/machine/imx31pdk.conf index 5e3fd23..0bb7aa7 100644 --- a/conf/machine/imx31pdk.conf +++ b/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/conf/machine/imx35pdk.conf b/conf/machine/imx35pdk.conf index 997d261..29d1c6a 100755 --- a/conf/machine/imx35pdk.conf +++ b/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/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 10d67ac..455d61f 100644 --- a/conf/machine/include/imx-base.inc +++ b/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" -- cgit v1.2.3-54-g00ecf