diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2013-01-06 19:16:20 -0200 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-01-07 08:30:27 -0200 |
commit | 90e1ad6d70f14f6018b511fb957bab33f53e101b (patch) | |
tree | 9c453faae081035c01d56ea1032481755f72fed4 /conf | |
parent | 0cc5437813e65ae2a30bc42fd590ccb564550bea (diff) | |
download | meta-fsl-arm-90e1ad6d70f14f6018b511fb957bab33f53e101b.tar.gz |
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>
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/imx31pdk.conf | 2 | ||||
-rwxr-xr-x | conf/machine/imx35pdk.conf | 2 | ||||
-rw-r--r-- | 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" | |||
10 | 10 | ||
11 | GUI_MACHINE_CLASS = "smallscreen" | 11 | GUI_MACHINE_CLASS = "smallscreen" |
12 | 12 | ||
13 | PREFERRED_PROVIDER_virtual/kernel = "linux-mainline" | ||
14 | |||
15 | XSERVER = "xserver-xorg \ | 13 | XSERVER = "xserver-xorg \ |
16 | xf86-input-evdev \ | 14 | xf86-input-evdev \ |
17 | xf86-video-fbdev" | 15 | 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 | |||
8 | 8 | ||
9 | SOC_FAMILY = "mx35:mx3" | 9 | SOC_FAMILY = "mx35:mx3" |
10 | 10 | ||
11 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-mainline" | ||
12 | |||
13 | UBOOT_ENTRYPOINT = "0x80008000" | 11 | UBOOT_ENTRYPOINT = "0x80008000" |
14 | UBOOT_LOADADDRESS = "0x80008000" | 12 | UBOOT_LOADADDRESS = "0x80008000" |
15 | UBOOT_MACHINE = "mx35pdk_config" | 13 | 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" | |||
58 | PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51" | 58 | PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-x11-bin-mx51" |
59 | PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-x11-bin-mx51" | 59 | PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-x11-bin-mx51" |
60 | 60 | ||
61 | PREFERRED_PROVIDER_virtual/kernel_mx3 = "linux-fslc" | ||
62 | |||
61 | EXTRA_IMAGEDEPENDS = "u-boot" | 63 | EXTRA_IMAGEDEPENDS = "u-boot" |
62 | 64 | ||
63 | SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" | 65 | SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" |