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 yocto 1.8

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2015-10-08 11:38:41 +02:00
parent d6f4515517
commit 4580ea842e
3 changed files with 14 additions and 4 deletions

View File

@ -3,6 +3,7 @@
#@DESCRIPTION: Machine configuration for Digi's ConnectCore for MX28 module.
include conf/machine/include/mxs-digi-base.inc
include conf/machine/include/tune-arm926ejs.inc
DIGI_FAMILY = "ccardimx28"
SOC_FAMILY = "mxs:mx28:${DIGI_FAMILY}"

View File

@ -14,11 +14,14 @@ PREFERRED_VERSION_directfb_mx6 = "1.7.4"
# Ship kernel modules
MACHINE_EXTRA_RRECOMMENDS = "kernel-modules"
# Float-Point setting
# Tunes for hard/soft float-point selection. Note that we allow building for
# thumb support giving distros the chance to enable thumb by setting
# ARM_INSTRUCTION_SET = "thumb"
#
# handled by software
# DEFAULTTUNE_mx6 ?= "cortexa9-neon"
# DEFAULTTUNE_mx6 ?= "cortexa9t-neon"
# handled by hardware
DEFAULTTUNE_mx6 ?= "cortexa9hf-neon"
DEFAULTTUNE_mx6 ?= "cortexa9thf-neon"
# Sub-architecture support
MACHINE_SOCARCH_SUFFIX ?= ""
@ -49,6 +52,7 @@ GPU_FLAVOUR = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11-', '', d)}"
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/libgles2_mx5 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
PREFERRED_PROVIDER_amd-gpu-mx51 ?= "amd-gpu-${GPU_FLAVOUR}bin-mx51"
# mx6 GPU libraries
PREFERRED_PROVIDER_virtual/egl_mx6 ?= "imx-gpu-viv"
@ -65,3 +69,6 @@ EXTRA_IMAGEDEPENDS = "u-boot"
KERNEL_IMAGETYPE = "uImage"
MACHINE_FEATURES = "apm usbgadget usbhost vfat alsa touchscreen"
# Add the ability to specify _imx machines
MACHINEOVERRIDES =. "imx:"

View File

@ -1,7 +1,6 @@
# Digi's MXS platforms common settings
include conf/machine/include/digi-defaults.inc
include conf/machine/include/soc-family.inc
include conf/machine/include/tune-arm926ejs.inc
XSERVER = "xserver-xorg \
xf86-input-evdev \
@ -30,3 +29,6 @@ EXTRA_IMAGEDEPENDS = "u-boot"
KERNEL_IMAGETYPE = "uImage"
MACHINE_FEATURES = "apm usbgadget usbhost vfat"
# Add the ability to specify _imx machines
MACHINEOVERRIDES =. "imx:"