Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi-arm: sync machine files with meta-fsl-arm 

This synchronizes the machine configuration files with the latest
changes in meta-fsl-arm for Daisy maintenance branch.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2014-06-06 18:51:07 +02:00
parent 3ac3f03242
commit 39f3fdcb28
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
meta-digi-arm/conf/machine/include/imx-digi-base.inc
View File

@ -12,15 +12,14 @@ XSERVER = "xserver-xorg \
xf86-input-evdev \ xf86-input-evdev \
${XSERVER_DRIVER}" ${XSERVER_DRIVER}"
# Use an older Xorg version until Vivante provides a valid GL API # FIXME: Use older versions until Vivante GPU is made compatible
PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.14.4" PREFERRED_VERSION_xserver-xorg_mx6 = "2:1.14.4"
PREFERRED_VERSION_directfb_mx6 = "1.6.3"
PREFERRED_VERSION_directfb-examples_mx6 = "1.6.0"
# Ship kernel modules # Ship kernel modules
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
# Extra udev rules
MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
# Float-Point setting # Float-Point setting
DEFAULTTUNE_mx6 ?= "cortexa9hf-neon" DEFAULTTUNE_mx6 ?= "cortexa9hf-neon"
@ -31,17 +30,25 @@ MACHINE_SOCARCH_mx6 = "${TUNE_PKGARCH}-mx6"
PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}" PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_ARCH_FILTER = "virtual/kernel"
MACHINE_SOCARCH_FILTER_mx5 = "virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl" MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins"
MACHINE_SOCARCH_FILTER_mx6 = "virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl" MACHINE_SOCARCH_FILTER_append_mx5 = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
MACHINE_SOCARCH_FILTER_append_mx6 = " virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa virtual/libgl"
INHERIT += "fsl-dynamic-packagearch" INHERIT += "fsl-dynamic-packagearch"
# Gstreamer plugin # Extra udev rules
MACHINE_EXTRA_RRECOMMENDS += "udev-extraconf"
# GStreamer 0.10 plugins
MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin" MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
# GStreamer 1.0 plugins
MACHINE_GSTREAMER_1_0_PLUGIN ?= ""
MACHINE_GSTREAMER_1_0_PLUGIN_mx6 ?= "gstreamer1.0-plugins-imx-meta"
# mx5 GPU libraries # mx5 GPU libraries
GPU_FLAVOUR = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11-', '', d)}" GPU_FLAVOUR = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11-', '', d)}"
PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51" PREFERRED_PROVIDER_virtual/egl_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51" PREFERRED_PROVIDER_virtual/libgles1_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51" PREFERRED_PROVIDER_virtual/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"

7
meta-digi-arm/conf/machine/include/mxs-digi-base.inc
View File

@ -4,18 +4,23 @@ include conf/machine/include/soc-family.inc
include conf/machine/include/tune-arm926ejs.inc include conf/machine/include/tune-arm926ejs.inc
# Disable perf features as 2.6.35.3 fail to build otherwise # Disable perf features as 2.6.35.3 fail to build otherwise
PERF_FEATURES_ENABLE = "" PERF_FEATURES_ENABLE_mx28 = ""
XSERVER = "xserver-xorg \ XSERVER = "xserver-xorg \
xf86-input-evdev \ xf86-input-evdev \
xf86-video-fbdev" xf86-video-fbdev"
# Gstreamer plugin
MACHINE_GSTREAMER_PLUGIN ?= ""
MACHINE_GSTREAMER_PLUGIN_mx28 ?= "gst-fsl-plugin"
# Sub-architecture support # Sub-architecture support
MACHINE_SOCARCH ?= "" MACHINE_SOCARCH ?= ""
MACHINE_SOCARCH_mx28 = "${TUNE_PKGARCH}-mx28" MACHINE_SOCARCH_mx28 = "${TUNE_PKGARCH}-mx28"
PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}" PACKAGE_EXTRA_ARCHS_append = " ${MACHINE_SOCARCH}"
MACHINE_ARCH_FILTER = "virtual/kernel" MACHINE_ARCH_FILTER = "virtual/kernel"
MACHINE_SOCARCH_FILTER = "libfslcodec libfslvpuwrap libfslparser gst-fsl-plugins"
INHERIT += "fsl-dynamic-packagearch" INHERIT += "fsl-dynamic-packagearch"