From dd03ec840cce03388a054b35fd36372c1799b297 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 3 Jun 2014 09:57:24 +0300 Subject: Include support for Toradox Apalis iMX6 Change-Id: I816971a8a6285fe558007e4ee40c0ad2d3a4d538 Reviewed-by: Andy Nichols --- conf/distro/include/apalis-imx6.conf | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 conf/distro/include/apalis-imx6.conf (limited to 'conf/distro') diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf new file mode 100644 index 0000000..114c8b8 --- /dev/null +++ b/conf/distro/include/apalis-imx6.conf @@ -0,0 +1,50 @@ +############################################################################# +## +## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +## +## This file is part of the Qt Enterprise Embedded Scripts of the Qt +## framework. +## +## $QT_BEGIN_LICENSE$ +## Commercial License Usage Only +## Licensees holding valid commercial Qt license agreements with Digia +## with an appropriate addendum covering the Qt Enterprise Embedded Scripts, +## may use this file in accordance with the terms contained in said license +## agreement. +## +## For further information use the contact form at +## http://qt.digia.com/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +IMAGE_FSTYPES = "tar.gz" + +BOOTFS_CONTENT = "\ + ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ + u-boot-${MACHINE}.imx:u-boot.imx \ + " +BOOTFS_DEPENDS = "u-boot:do_deploy" + +PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.9-1.0.0-hfp" + +MACHINE_EXTRA_INSTALL = "\ + libgal-mx6 \ + libegl-mx6 \ + libgles2-mx6 \ + " + +MACHINE_EXTRA_INSTALL_SDK = " \ + libgal-mx6 \ + libegl-mx6 \ + libegl-mx6-dev \ + libgles2-mx6 \ + libgles2-mx6-dev \ + " + +ADB_PRODUCTID = "0x0000" + +SERIAL_CONSOLES = "115200;ttymxc0 \ + 115200;ttymxc1" -- cgit v1.2.3-54-g00ecf From d768de192ef6d055f59cc512e6ff478305cf55f2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 12 Jun 2014 15:38:46 +0300 Subject: imx6: set preferred version for gpu drivers Including older gpu drivers in b2qt layer, caused it to be used in all machined. Set preferred version to latest for all but apalis that needs to older one. The matching kernel version is set on upstream layer, so no need to specify it here. Change-Id: Ia4ebfbc3b66d481f9e2b5a996d242f853b03a464 Reviewed-by: Andy Nichols --- conf/distro/include/imx6qsabresd.conf | 2 ++ conf/distro/include/nitrogen6x.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'conf/distro') diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 1298ee4..36d579d 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -31,6 +31,8 @@ BOOTFS_CONTENT = "\ " BOOTFS_DEPENDS = "u-boot:do_deploy" +PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp" + MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 8066936..8b9838e 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -34,7 +34,7 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-bounda EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" -PREFERRED_VERSION_linux-boundary = "3.10.17" +PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ -- cgit v1.2.3-54-g00ecf From 4918900c5f44676e59641f4947347cedbf9d76cc Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 23 Jun 2014 10:09:56 +0300 Subject: toradex: Add hardware acceleration for gstream Include FSL gstreamer plugins in Toradex Apalis iMX6 image. The fls plugins are dependent on imx-lib which are dependent on the kernel version, so needed to pull older version of imx-lib recipe from meta-fsl-arm to support the older kernel used by toradex. Setting preferred version for the latest imx-lib for all other imx6 devices. Change-Id: I0351c6b1707f2965f756d0298948f29ae1c828f6 Reviewed-by: Kalle Viironen --- conf/distro/include/apalis-imx6.conf | 2 ++ conf/distro/include/imx6qsabresd.conf | 1 + conf/distro/include/nitrogen6x.conf | 1 + recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb | 10 ++++++++++ 4 files changed, 14 insertions(+) create mode 100644 recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb (limited to 'conf/distro') diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf index 114c8b8..144693d 100644 --- a/conf/distro/include/apalis-imx6.conf +++ b/conf/distro/include/apalis-imx6.conf @@ -29,11 +29,13 @@ BOOTFS_CONTENT = "\ BOOTFS_DEPENDS = "u-boot:do_deploy" PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.9-1.0.0-hfp" +PREFERRED_VERSION_imx-lib = "3.10.9-1.0.0" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ libgles2-mx6 \ + gst-fsl-plugin \ " MACHINE_EXTRA_INSTALL_SDK = " \ diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf index 36d579d..a19f85f 100644 --- a/conf/distro/include/imx6qsabresd.conf +++ b/conf/distro/include/imx6qsabresd.conf @@ -32,6 +32,7 @@ BOOTFS_CONTENT = "\ BOOTFS_DEPENDS = "u-boot:do_deploy" PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp" +PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 8b9838e..9af8417 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -35,6 +35,7 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-bounda EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp" +PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0" MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ diff --git a/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb b/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb new file mode 100644 index 0000000..f2a736a --- /dev/null +++ b/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb @@ -0,0 +1,10 @@ +# Copyright (C) 2013 Freescale Semiconductor + +require recipes-bsp/imx-lib/imx-lib.inc + +SRC_URI[md5sum] = "5cc9c8d09c7ba401cdab4a2ecbda89e2" +SRC_URI[sha256sum] = "d1581c2f2956731da0c42e9dc17514a4d00790deeb83defeb5e07d14746190d8" + +PE = "1" + +COMPATIBLE_MACHINE = "(mx6)" -- cgit v1.2.3-54-g00ecf