summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Viironen <kalle.viironen@digia.com>2014-07-04 09:28:14 +0300
committerKalle Viironen <kalle.viironen@digia.com>2014-07-04 09:28:19 +0300
commit82d54484a66e4912a03bb6605457fde62b9f9bcd (patch)
tree721a6cd030817d885822af49a8a6d0209e774cd4
parent24cb0946765e299d4553ab5fa2a37afcac1ea242 (diff)
parent9e1f91f349e0ca11cd8a13d180f9f9557daa3ef8 (diff)
downloadmeta-boot2qt-82d54484a66e4912a03bb6605457fde62b9f9bcd.tar.gz
Merge branch 'stable' into releaseQtEE_v3.1.0
* stable: linux-boundary: revert 1G/3G memory split configure Use specific SHA1 from all of the meta repos beagleboard specific u-boot was removed from meta-ti Old libgles-omap3 packages were removed from meta-ti toradex: enable FunctionFS module needed for adb bbb: correct path for kernel configure fragment image: include i2c-tools in image adb: enabled network mode for toradex toradex: Add hardware acceleration for gstream adbd: add dependency to openssl for libcrypto Include toradex repository imx6: set preferred version for gpu drivers Include older Vivante drivers for Apalis iMX6 Include support for Toradox Apalis iMX6 BBB: enable USB serial kernel drivers No need for RPi in BBMASK Change-Id: Ic3192cd00a8b24972253c64f294de5d364111135
Diffstat
-rw-r--r--README18
-rwxr-xr-xb2qt-init-build-env47
-rw-r--r--conf/bblayers.conf.sample1
-rw-r--r--conf/distro/include/apalis-imx6.conf (renamed from recipes/libgles/libgles-omap3_4.05.00.03.bbappend)37
-rw-r--r--conf/distro/include/imx6qsabresd.conf3
-rw-r--r--conf/distro/include/nitrogen6x.conf3
-rw-r--r--conf/local.conf.sample3
-rw-r--r--recipes/adbd/adbd.bb1
-rw-r--r--recipes/adbd/files/apalis-imx6/defaults4
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc246
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch30
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc12
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc12
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch31
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch34
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc10
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc12
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc12
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc12
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc12
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc12
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc12
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc10
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc10
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb11
-rw-r--r--recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb10
-rw-r--r--recipes/libgles/libgles-omap3_5.00.00.01.bbappend46
-rw-r--r--recipes/libgles/libgles-omap3_5.01.01.01.bbappend (renamed from recipes/libgles/libgles-omap3_5.01.00.01.bbappend)0
-rw-r--r--recipes/linux/linux-boundary_3.10.17.bbappend3
-rw-r--r--recipes/linux/linux-ti-staging/usb-serial.cfg4
-rw-r--r--recipes/linux/linux-ti-staging_3.12.bbappend5
-rw-r--r--recipes/linux/linux-toradex-fsl_git.bbappend (renamed from recipes/u-boot/u-boot-beagleboard_2011.09.bbappend)8
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb1
-rw-r--r--recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch77
34 files changed, 579 insertions, 170 deletions
diff --git a/README b/README
index e23e4e2..b3b55a4 100644
--- a/README
+++ b/README
@@ -28,27 +28,31 @@ OpenEmbedded and Yocto.
28 28
29This layer depends on: 29This layer depends on:
30 30
31URI: git://git.openembedded.org/openembedded-core 31URI: git://git.yoctoproject.org/poky
32branch: daisy 32branch: daisy
33revision: HEAD 33revision: b0ce70ffa820c8b4069bdb413f7aa9db668b9428
34 34
35URI: git://git.openembedded.org/meta-openembedded 35URI: git://git.openembedded.org/meta-openembedded
36layer: meta-oe 36layer: meta-oe
37branch: daisy 37branch: daisy
38revision: HEAD 38revision: a6dcf6265822ca1484d991d10a3042e04a960cdb
39 39
40URI: git://git.yoctoproject.org/meta-ti 40URI: git://git.yoctoproject.org/meta-ti
41branch: daisy 41branch: daisy
42revision: HEAD 42revision: 5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66
43 43
44URI: git://git.yoctoproject.org/meta-fsl-arm 44URI: git://git.yoctoproject.org/meta-fsl-arm
45branch: daisy 45branch: daisy
46revision: HEAD 46revision: f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b
47 47
48URI: git://github.com/Freescale/meta-fsl-arm-extra 48URI: git://github.com/Freescale/meta-fsl-arm-extra
49branch: daisy 49branch: daisy
50revision: HEAD 50revision: 029f535cfbc5746288c6129babb2d7679927a183
51 51
52URI: git://git.yoctoproject.org/meta-raspberrypi 52URI: git://git.yoctoproject.org/meta-raspberrypi
53branch: daisy 53branch: daisy
54revision: HEAD 54revision: cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55
55
56URI: git://git.toradex.com/meta-toradex.git
57branch: V2.2
58revision: 371ea626f29a2a12294ab6ea30e36743a9e2f78f
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 952e4a3..bc747b8 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -33,29 +33,32 @@ mkdir -p ${1}
33DIR=$(readlink -f $(dirname $0)) 33DIR=$(readlink -f $(dirname $0))
34BUILDDIR=$(readlink -f $1) 34BUILDDIR=$(readlink -f $1)
35 35
36if [ ! -d ${BUILDDIR}/poky ]; then 36checkout() {
37 git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b daisy 37 REPO=$1
38fi 38 REPODIR=${REPO##*/}
39 39 if [ ${REPODIR} != "poky" ]; then
40if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then 40 REPODIR="poky/${REPODIR}"
41 git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b daisy 41 fi
42fi 42 REF=${2%%:*}
43 43 SHA1=${2##*:}
44if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then 44 if [ ! -d ${BUILDDIR}/${REPODIR} ]; then
45 git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b daisy 45 mkdir ${BUILDDIR}/${REPODIR}
46fi 46 cd ${BUILDDIR}/${REPODIR}
47 git init
48 git remote add origin ${REPO} -f
49 git checkout ${REF}
50 git reset --hard ${SHA1}
51 cd -
52 fi
53}
47 54
48if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then 55checkout git://git.yoctoproject.org/poky "daisy:b0ce70ffa820c8b4069bdb413f7aa9db668b9428"
49 git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b daisy 56checkout git://git.openembedded.org/meta-openembedded "daisy:a6dcf6265822ca1484d991d10a3042e04a960cdb"
50fi 57checkout git://git.yoctoproject.org/meta-ti "daisy:5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66"
51 58checkout git://git.yoctoproject.org/meta-fsl-arm "daisy:f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b"
52if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then 59checkout git://github.com/Freescale/meta-fsl-arm-extra "daisy:029f535cfbc5746288c6129babb2d7679927a183"
53 git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b daisy 60checkout git://git.yoctoproject.org/meta-raspberrypi "daisy:cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55"
54fi 61checkout git://git.toradex.com/meta-toradex "V2.2:371ea626f29a2a12294ab6ea30e36743a9e2f78f"
55
56if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then
57 git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy
58fi
59 62
60if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then 63if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then
61 ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt 64 ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 5a95ec2..9789ceb 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -34,6 +34,7 @@ BBLAYERS ?= " \
34 ##COREBASE##/meta-fsl-arm-extra \ 34 ##COREBASE##/meta-fsl-arm-extra \
35 ##COREBASE##/meta-ti \ 35 ##COREBASE##/meta-ti \
36 ##COREBASE##/meta-raspberrypi \ 36 ##COREBASE##/meta-raspberrypi \
37 ##COREBASE##/meta-toradex \
37 ##COREBASE##/meta-openembedded/meta-oe \ 38 ##COREBASE##/meta-openembedded/meta-oe \
38 ##COREBASE##/meta-b2qt \ 39 ##COREBASE##/meta-b2qt \
39 " 40 "
diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/conf/distro/include/apalis-imx6.conf
index 73a2408..144693d 100644
--- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend
+++ b/conf/distro/include/apalis-imx6.conf
@@ -20,20 +20,33 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" 23IMAGE_FSTYPES = "tar.gz"
24 24
25TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}" 25BOOTFS_CONTENT = "\
26 ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
27 u-boot-${MACHINE}.imx:u-boot.imx \
28 "
29BOOTFS_DEPENDS = "u-boot:do_deploy"
26 30
27FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 31PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.9-1.0.0-hfp"
28SRC_URI += " file://0001-Add-GLchar-typedef.patch" 32PREFERRED_VERSION_imx-lib = "3.10.9-1.0.0"
29 33
30LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" 34MACHINE_EXTRA_INSTALL = "\
35 libgal-mx6 \
36 libegl-mx6 \
37 libgles2-mx6 \
38 gst-fsl-plugin \
39 "
31 40
32do_install_append() { 41MACHINE_EXTRA_INSTALL_SDK = " \
33 echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini 42 libgal-mx6 \
34} 43 libegl-mx6 \
44 libegl-mx6-dev \
45 libgles2-mx6 \
46 libgles2-mx6-dev \
47 "
35 48
36pkg_postinst_${PN}_append() { 49ADB_PRODUCTID = "0x0000"
37ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) 50
38echo ${ESREV} > $D${sysconfdir}/powervr-esrev 51SERIAL_CONSOLES = "115200;ttymxc0 \
39} 52 115200;ttymxc1"
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
index 1298ee4..a19f85f 100644
--- a/conf/distro/include/imx6qsabresd.conf
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -31,6 +31,9 @@ BOOTFS_CONTENT = "\
31 " 31 "
32BOOTFS_DEPENDS = "u-boot:do_deploy" 32BOOTFS_DEPENDS = "u-boot:do_deploy"
33 33
34PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp"
35PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
36
34MACHINE_EXTRA_INSTALL = "\ 37MACHINE_EXTRA_INSTALL = "\
35 libgal-mx6 \ 38 libgal-mx6 \
36 libegl-mx6 \ 39 libegl-mx6 \
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 8066936..9af8417 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -34,7 +34,8 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-bounda
34 34
35EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" 35EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
36 36
37PREFERRED_VERSION_linux-boundary = "3.10.17" 37PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp"
38PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
38 39
39MACHINE_EXTRA_INSTALL = "\ 40MACHINE_EXTRA_INSTALL = "\
40 libgal-mx6 \ 41 libgal-mx6 \
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index a9e1b34..3874397 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -275,7 +275,8 @@ CONF_VERSION = "1"
275 275
276INHERIT += "rm_work" 276INHERIT += "rm_work"
277 277
278BBMASK = "meta-ti/recipes-misc|meta-raspberrypi/recipes-graphics/mesa/mesa_9.2.2.bbappend" 278BBMASK = "meta-ti/recipes-misc"
279BBMASK += "|meta-toradex/recipes/images|meta-toradex/recipes-browser|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes-mozilla|meta-toradex/recipes-graphics|meta-toradex/recipes-devtools/mtd|meta-toradex/recipes-core/psplash|meta-toradex/recipes-lxde|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes/trdx-config|meta-toradex/recipes-core/util-linux|meta-toradex/recipes-core/systemd|meta-toradex/recipes-support|meta-toradex/recipes-core/dropbear|meta-toradex/recipes/base-files|meta-toradex/recipes-multimedia/gstreamer"
279ACCEPT_FSL_EULA = "1" 280ACCEPT_FSL_EULA = "1"
280LICENSE_FLAGS_WHITELIST = "commercial" 281LICENSE_FLAGS_WHITELIST = "commercial"
281 282
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index 9e3ed67..562e1d1 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -31,6 +31,7 @@ PR = "r0"
31SRCREV = "${PV}" 31SRCREV = "${PV}"
32 32
33RRECOMMENDS_${PN} += "kernel-module-g-ffs" 33RRECOMMENDS_${PN} += "kernel-module-g-ffs"
34DEPENDS = "openssl"
34 35
35SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https \ 36SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https \
36 file://adbd.patch;striplevel=2 \ 37 file://adbd.patch;striplevel=2 \
diff --git a/recipes/adbd/files/apalis-imx6/defaults b/recipes/adbd/files/apalis-imx6/defaults
new file mode 100644
index 0000000..0fbba4c
--- /dev/null
+++ b/recipes/adbd/files/apalis-imx6/defaults
@@ -0,0 +1,4 @@
1VENDOR=0x18d1
2PRODUCT=0x0000
3SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
4USE_ETHERNET=yes
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
new file mode 100644
index 0000000..f661539
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -0,0 +1,246 @@
1# Copyright (C) 2012-2013 Freescale Semiconductor
2# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
3# Released under the MIT license (see COPYING.MIT for the terms)
4
5DESCRIPTION = "GPU driver and apps for imx6"
6SECTION = "libs"
7LICENSE = "Proprietary"
8LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3"
9DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', '', d)}"
10PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 virtual/libopenvg"
11
12PE = "1"
13
14inherit fsl-eula-unpack
15
16SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
17 file://egl.pc \
18 file://egl_x11.pc \
19 file://glesv1_cm.pc \
20 file://glesv1_cm_x11.pc \
21 file://glesv2.pc \
22 file://glesv2_x11.pc \
23 file://vg.pc \
24 file://vg_x11.pc \
25 file://gc_wayland_protocol.pc \
26 file://wayland-egl.pc \
27 file://wayland-viv.pc \
28 "
29
30PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
31 libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
32 libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
33 libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
34 libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \
35 libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \
36 libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \
37 libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \
38 libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \
39 libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \
40 libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \
41 libvivante-dri-mx6 \
42 libvivante-dfb-mx6 \
43 libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \
44 libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \
45 libwayland-egl-mx6-dev \
46"
47
48# Skip package if it does not match the machine float-point type in use
49python __anonymous () {
50 is_machine_hardfp = base_contains("TUNE_FEATURES", "callconvention-hard", True, False, d)
51 is_package_hardfp = d.getVar("PACKAGE_FP_TYPE", True) == "hardfp"
52
53 if is_package_hardfp != is_machine_hardfp:
54 PN = d.getVar("PN", True)
55 PV = d.getVar("PV", True)
56 bb.debug(1, "Skipping %s (%s) as machine and package float-point does not match" % (PN, PV))
57 raise bb.parse.SkipPackage("Package Float-Point is not compatible with the machine")
58}
59
60USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}"
61USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}"
62USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}"
63
64# Inhibit warnings about files being stripped.
65INHIBIT_PACKAGE_STRIP = "1"
66INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
67
68# FIXME: The provided binary doesn't provide soname. If in future BSP
69# release the libraries are fixed, we can drop this hack.
70REALSOLIBS := "${SOLIBS}"
71SOLIBS = "${SOLIBSDEV}"
72
73# For the packages that make up the OpenGL interfaces, inject variables so that
74# they don't get Debian-renamed (which would remove the -mx6 suffix).
75#
76# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
77# the source we cannot fix it. Disable the insane check for now.
78python __anonymous() {
79 packages = d.getVar('PACKAGES', True).split()
80 for p in packages:
81 d.appendVar("INSANE_SKIP_%s" % p, " ldflags")
82
83 for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
84 ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
85 ("libgles3",)):
86 fullp = p[0] + "-mx6"
87 pkgs = " ".join(p)
88 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
89 d.appendVar("RREPLACES_" + fullp, pkgs)
90 d.appendVar("RPROVIDES_" + fullp, pkgs)
91 d.appendVar("RCONFLICTS_" + fullp, pkgs)
92
93 # For -dev, the first element is both the Debian and original name
94 fullp += "-dev"
95 pkgs = p[0] + "-dev"
96 d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
97 d.appendVar("RREPLACES_" + fullp, pkgs)
98 d.appendVar("RPROVIDES_" + fullp, pkgs)
99 d.appendVar("RCONFLICTS_" + fullp, pkgs)
100}
101
102do_install () {
103 install -d ${D}${libdir}
104 install -d ${D}${includedir}
105
106 cp -a ${S}/usr/lib/*.so* ${D}${libdir}
107 cp -axr ${S}/usr/include/* ${D}${includedir}
108 cp -axr ${S}/opt ${D}
109
110 install -d ${D}${libdir}/pkgconfig
111
112 # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb
113 if [ "${USE_X11}" = "yes" ]; then
114 cp -r ${S}/usr/lib/dri ${D}${libdir}
115 backend=x11
116
117 install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
118 install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
119 install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
120 install -m 0644 ${WORKDIR}/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
121 #FIXME: WL & X11 is not currently functional
122 #if [ "${USE_WL}" = "yes" ]; then
123 # install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
124 # install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
125 # install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
126 #fi
127 elif [ "${USE_WL}" = "yes" ]; then
128 backend=wl
129
130 install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
131 install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
132 install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
133 install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
134 install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
135 install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
136 install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
137 else
138 install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
139 install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
140 install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
141 install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
142
143 if [ "${USE_DFB}" = "yes" ]; then
144 cp -r ${S}/usr/lib/directfb-1.6-0 ${D}${libdir}
145 backend=dfb
146 else
147 # Regular framebuffer
148 backend=fb
149 fi
150 fi
151
152 # We'll only have one backend here so we rename it to generic name
153 # and avoid rework in other packages, when possible
154 mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0
155 ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2
156 ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so
157 mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0
158 ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1
159 ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so
160 mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so
161 mv ${D}${libdir}/libVIVANTE-${backend}.so ${D}${libdir}/libVIVANTE.so
162
163 for backend in wl x11 fb dfb; do
164 find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';'
165 done
166
167 find ${D}${libdir} -type f -exec chmod 644 {} \;
168 find ${D}${includedir} -type f -exec chmod 644 {} \;
169}
170
171S = "${WORKDIR}/${PN}-${PV}"
172
173FILES_${PN} += "/opt"
174FILES_${PN}-dev = "${includedir}"
175FILES_${PN}-dbg = "${libdir}/.debug /opt/viv_samples/*/*/.debug"
176
177FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
178FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
179FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
180
181# libEGL.so is used by some demo apps from Freescale
182INSANE_SKIP_libegl-mx6 += "dev-so"
183FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
184FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
185FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
186
187FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"
188FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}"
189FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
190
191FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}"
192FILES_libgl-mx6-dev = "${libdir}/libGL${SOLIBSDEV}"
193FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
194RDEPENDS_libgl-mx6-dev = "libgl-mesa-dev"
195
196# libEGL needs to open libGLESv1.so
197INSANE_SKIP_libgles-mx6 += "dev-so"
198FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}"
199FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
200FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
201
202# libEGL needs to open libGLESv2.so
203INSANE_SKIP_libgles2-mx6 += "dev-so"
204FILES_libgles2-mx6 = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}"
205FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc"
206FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
207RDEPENDS_libgles2-mx6 = "libglslc-mx6"
208
209FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}"
210FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
211FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}"
212
213FILES_libopencl-mx6 = "${libdir}/libOpenCL${SOLIBS}"
214FILES_libopencl-mx6-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
215FILES_libopencl-mx6-dbg = "${libdir}/.debug/libOpenCL${SOLIBS}"
216RDEPENDS_libopencl-mx6 = "libclc-mx6"
217
218FILES_libopenvg-mx6 = "${libdir}/libOpenVG*${SOLIBS}"
219FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc"
220FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}"
221
222FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}"
223FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}"
224FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}"
225
226FILES_libvivante-mx6 = "${libdir}/libVIVANTE${SOLIBS}"
227FILES_libvivante-mx6-dev = "${libdir}/libVIVANTE${SOLIBSDEV}"
228FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}"
229
230FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so"
231
232FILES_libvivante-dfb-mx6 = "${libdir}/directfb-1.6-0/gfxdrivers/libdirectfb_gal.so"
233
234INSANE_SKIP_libwayland-viv-mx6 += "dev-so"
235FILES_libwayland-viv-mx6 = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}"
236FILES_libwayland-viv-mx6-dev = "${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc"
237FILES_libwayland-viv-mx6-dbg = "${libdir}/.debug/libwayland-viv${SOLIBS}"
238
239INSANE_SKIP_libgc-wayland-protocol-mx6 += "dev-so"
240FILES_libgc-wayland-protocol-mx6 = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}"
241FILES_libgc-wayland-protocol-mx6-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc"
242FILES_libgc-wayland-protocol-mx6-dbg = "${libdir}/libgc_wayland_protocol${SOLIBS}"
243
244FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc"
245
246COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
new file mode 100644
index 0000000..dc91d7c
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
@@ -0,0 +1,30 @@
1From 1a4a35678ef70283d1a31835deecd39711a9db86 Mon Sep 17 00:00:00 2001
2From: Jeremy Stashluk <jstashluk@dekaresearch.com>
3Date: Wed, 30 Jan 2013 13:16:53 -0500
4Subject: [PATCH] change header path to HAL
5
6The gpu-viv-bin-mx6q package from Freescale puts this header in the HAL
7directory under the system. I think this is a problem in the LTIB release as
8well.
9
10Upstream-Status: Pending
11
12Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
13
14---
15 usr/include/gc_vdk_types.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18Index: gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
19===================================================================
20--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/gc_vdk_types.h
21+++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
22@@ -39,7 +39,7 @@ extern "C" {
23 #endif
24
25 #include <EGL/egl.h>
26-#include "gc_hal_eglplatform_type.h"
27+#include <HAL/gc_hal_eglplatform_type.h>
28
29
30 /*******************************************************************************
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
new file mode 100644
index 0000000..a21922d
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: egl
7Description: Vivante EGL library
8Requires.private:
9Version: 8.0
10Libs: -L${libdir} -lEGL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir} -DLINUX
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
new file mode 100644
index 0000000..5921583
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: egl
7Description: Vivante EGL library
8Requires.private: libdrm x11 xext xdamage xfixes xcb
9Version: 8.0
10Libs: -L${libdir} -lEGL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir} -DLINUX
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
new file mode 100644
index 0000000..3eac116
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
@@ -0,0 +1,31 @@
1Avoid conflicting types with Xorg newer code
2
3Upstream-Status: Pending
4Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
5
6Index: gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h
7===================================================================
8--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/HAL/gc_hal_base.h
9+++ gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h
10@@ -101,7 +101,7 @@ extern gcsPLS gcPLS;
11 typedef struct _gcsTLS * gcsTLS_PTR;
12
13 typedef void (* gctTLS_DESTRUCTOR) (
14- gcsTLS_PTR TLS
15+ gcsTLS_PTR pTLS
16 );
17
18 typedef struct _gcsTLS
19@@ -648,10 +648,10 @@ gcoOS_SetPLSValue(
20 /* Get access to the thread local storage. */
21 gceSTATUS
22 gcoOS_GetTLS(
23- OUT gcsTLS_PTR * TLS
24+ OUT gcsTLS_PTR * pTLS
25 );
26
27- /* Copy the TLS from a source thread. */
28+ /* Copy the pTLS from a source thread. */
29 gceSTATUS gcoOS_CopyTLS(IN gcsTLS_PTR Source);
30
31 /* Destroy the objects associated with the current thread. */
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
new file mode 100644
index 0000000..732a073
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
@@ -0,0 +1,34 @@
1From c59f9640d185759208f9d55a93b6602936dcb5e8 Mon Sep 17 00:00:00 2001
2From: Adrian Alonso <aalonso00@gmail.com>
3Date: Sat, 26 Jan 2013 17:52:04 -0600
4Subject: [PATCH 2/2] gc_hal_eglplatform: remove xlib undefs
5
6* Remove header undefs for Always and Status definitions
7
8Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
9---
10 usr/include/HAL/gc_hal_eglplatform.h | 3 ---
11 1 file changed, 3 deletions(-)
12
13diff --git a/usr/include/HAL/gc_hal_eglplatform.h b/usr/include/HAL/gc_hal_eglplatform.h
14index a968fe7..e80c65a 100644
15--- a/usr/include/HAL/gc_hal_eglplatform.h
16+++ b/usr/include/HAL/gc_hal_eglplatform.h
17@@ -341,14 +341,11 @@ typedef Pixmap HALNativePixmapType;
18 /* Rename some badly named X defines. */
19 #ifdef Status
20 # define XStatus int
21-# undef Status
22 #endif
23 #ifdef Always
24 # define XAlways 2
25-# undef Always
26 #endif
27 #ifdef CurrentTime
28-# undef CurrentTime
29 # define XCurrentTime 0
30 #endif
31
32--
331.8.1
34
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
new file mode 100644
index 0000000..f4610ea
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
@@ -0,0 +1,10 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib
4includedir=${prefix}/include
5
6Name: gc_wayland_protocol
7Description: Vivante Wayland Protocol Extension Library
8Version: 0.1
9Cflags: -I${includedir}
10Libs: -L${libdir} -lgc_wayland_protocol
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
new file mode 100644
index 0000000..d97b067
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: glesv1_cm
7Description: Vivante OpenGL ES 1.1 CM library
8Requires.private:
9Version: 8.0
10Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
new file mode 100644
index 0000000..e801633
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: glesv1_cm
7Description: Vivante OpenGL ES 1.1 CM library
8Requires.private: libdrm x11 xext xdamage xfixes xcb
9Version: 8.0
10Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
new file mode 100644
index 0000000..9be46f2
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: glesv2
7Description: Vivante OpenGL ES 2.0 library
8Requires.private:
9Version: 8.0
10Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
11Libs.private: -lpthread -lrt
12Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
new file mode 100644
index 0000000..57ad807
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: glesv2
7Description: Vivante OpenGL ES 2.0 library
8Requires.private: libdrm x11 xext xdamage xfixes xcb
9Version: 8.0
10Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
11Libs.private: -lpthread -lrt
12Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
new file mode 100644
index 0000000..7c00def
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: vg
7Description: Vivante OpenVG 1.1 library
8Requires.private:
9Version: 8.0
10Libs: -L${libdir} -lOpenVG -lEGL -lGAL
11Libs.private: -lpthread -lrt
12Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
new file mode 100644
index 0000000..94fb91e
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
@@ -0,0 +1,12 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: vg
7Description: Vivante OpenVG 1.1 library
8Requires.private: libdrm x11 xext xdamage xfixes xcb
9Version: 8.0
10Libs: -L${libdir} -lOpenVG -lEGL -lGAL
11Libs.private: -lpthread -lrt
12Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
new file mode 100644
index 0000000..ba1b898
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
@@ -0,0 +1,10 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib
4includedir=${prefix}/include
5
6Name: wayland-egl
7Description: Bind the driver EGL to the Wayland API
8Version: 1.0.0
9Libs: -L${libdir} -lEGL
10Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
new file mode 100644
index 0000000..3fdedd0
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
@@ -0,0 +1,10 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib
4includedir=${prefix}/include
5
6Name: Wayland Vivante Lib
7Description: Wayland server side library for Vivante's EGL driver
8Version: 0.1
9Cflags: -I${includedir}/wayland-viv
10Libs: -L${libdir} -lwayland-viv
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
new file mode 100644
index 0000000..5c7727b
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
@@ -0,0 +1,11 @@
1# Copyright (C) 2013 Freescale Semiconductor
2# Released under the MIT license (see COPYING.MIT for the terms)
3
4require gpu-viv-bin-mx6q.inc
5
6SRC_URI[md5sum] = "52f5ebbb6a9b5d0eafdb952246de584e"
7SRC_URI[sha256sum] = "8b0386e13d4a7c770f8bc8e7a6119629c5ed379488dd5ef635bc92353f906003"
8
9PACKAGE_FP_TYPE = "hardfp"
10
11RDEPENDS_libgl-mx6-dev = ""
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 @@
1# Copyright (C) 2013 Freescale Semiconductor
2
3require recipes-bsp/imx-lib/imx-lib.inc
4
5SRC_URI[md5sum] = "5cc9c8d09c7ba401cdab4a2ecbda89e2"
6SRC_URI[sha256sum] = "d1581c2f2956731da0c42e9dc17514a4d00790deeb83defeb5e07d14746190d8"
7
8PE = "1"
9
10COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
deleted file mode 100644
index f0b5754..0000000
--- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
+++ /dev/null
@@ -1,46 +0,0 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
24
25BINLOCATION_omap3 = "${S}/gfx_rel_es5.x"
26BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x"
27
28LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
29
30do_install_append() {
31 echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini
32}
33
34# Inhibit warnings about files being stripped.
35INHIBIT_PACKAGE_SPLIT = "1"
36
37pkg_postinst_${PN}_append() {
38ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
39echo ${ESREV} > $D${sysconfdir}/powervr-esrev
40}
41
42RRECOMMENDS_${PN} = "omap3-sgx-modules"
43RRECOMMENDS_${PN}-blitwsegl = ""
44RRECOMMENDS_${PN}-flipwsegl = ""
45RRECOMMENDS_${PN}-frontwsegl = ""
46RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
index 9a90577..9a90577 100644
--- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
diff --git a/recipes/linux/linux-boundary_3.10.17.bbappend b/recipes/linux/linux-boundary_3.10.17.bbappend
index dd9420e..ae59272 100644
--- a/recipes/linux/linux-boundary_3.10.17.bbappend
+++ b/recipes/linux/linux-boundary_3.10.17.bbappend
@@ -34,4 +34,7 @@ do_configure_prepend() {
34 echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig 34 echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig
35 echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig 35 echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig
36 echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig 36 echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig
37
38 # fix imx-vpu break on video decoding
39 echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig
37} 40}
diff --git a/recipes/linux/linux-ti-staging/usb-serial.cfg b/recipes/linux/linux-ti-staging/usb-serial.cfg
new file mode 100644
index 0000000..8f0688e
--- /dev/null
+++ b/recipes/linux/linux-ti-staging/usb-serial.cfg
@@ -0,0 +1,4 @@
1CONFIG_USB_SERIAL=m
2CONFIG_USB_SERIAL_GENERIC=y
3CONFIG_USB_SERIAL_FTDI_SIO=m
4CONFIG_USB_SERIAL_PL2303=m
diff --git a/recipes/linux/linux-ti-staging_3.12.bbappend b/recipes/linux/linux-ti-staging_3.12.bbappend
index fe2bdd2..b2d6104 100644
--- a/recipes/linux/linux-ti-staging_3.12.bbappend
+++ b/recipes/linux/linux-ti-staging_3.12.bbappend
@@ -20,4 +20,9 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
24SRC_URI += "\
25 file://usb-serial.cfg \
26 "
27KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg"
23KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb" 28KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/linux/linux-toradex-fsl_git.bbappend
index f6fbde1..adee8c4 100644
--- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend
+++ b/recipes/linux/linux-toradex-fsl_git.bbappend
@@ -20,7 +20,7 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 23config_script () {
24SRC_URI += " \ 24 # FunctionFS for adb
25 file://0001-beagle-change-default-kernel-args.patch \ 25 echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config
26 " 26}
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 61ca211..7b528f0 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -30,4 +30,5 @@ RDEPENDS_${PN} = "\
30 ldd \ 30 ldd \
31 binutils \ 31 binutils \
32 binutils-symlinks \ 32 binutils-symlinks \
33 i2c-tools \
33 " 34 "
diff --git a/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch b/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch
deleted file mode 100644
index 1dea7f5..0000000
--- a/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch
+++ /dev/null
@@ -1,77 +0,0 @@
1From 9ac6875931f5f9d073ca31cd6e1fb7636afb76bc Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Thu, 23 May 2013 14:37:10 +0300
4Subject: [PATCH] beagle: change default kernel args
5
6- default resolution to 800x600
7- increase VRAM for fb0
8- disable console blank
9- disable console cursor blinking
10- use extrabootargs
11---
12 include/configs/omap3_beagle.h | 20 ++++++++++++++++----
13 1 file changed, 16 insertions(+), 4 deletions(-)
14
15diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
16index 1cc46dc..945e15e 100644
17--- a/include/configs/omap3_beagle.h
18+++ b/include/configs/omap3_beagle.h
19@@ -224,7 +224,7 @@
20 "optargs=\0" \
21 "camera=none\0" \
22 "vram=12M\0" \
23- "dvimode=640x480MR-16@60\0" \
24+ "dvimode=800x600MR-16@60\0" \
25 "defaultdisplay=dvi\0" \
26 "mmcdev=0\0" \
27 "mmcroot=/dev/mmcblk0p2 ro\0" \
28@@ -240,20 +240,28 @@
29 "buddy2=${buddy2} "\
30 "camera=${camera} "\
31 "vram=${vram} " \
32+ "omapfb.vram=0:${vram} " \
33 "omapfb.mode=dvi:${dvimode} " \
34 "omapdss.def_disp=${defaultdisplay} " \
35 "root=${mmcroot} " \
36- "rootfstype=${mmcrootfstype}\0" \
37+ "rootfstype=${mmcrootfstype} " \
38+ "consoleblank=0 " \
39+ "vt.global_cursor_default=0 " \
40+ "${extrabootargs}\0" \
41 "nandargs=setenv bootargs console=${console} " \
42 "${optargs} " \
43 "mpurate=${mpurate} " \
44 "buddy=${buddy} "\
45 "camera=${camera} "\
46 "vram=${vram} " \
47+ "omapfb.vram=0:${vram} " \
48 "omapfb.mode=dvi:${dvimode} " \
49 "omapdss.def_disp=${defaultdisplay} " \
50 "root=${nandroot} " \
51- "rootfstype=${nandrootfstype}\0" \
52+ "rootfstype=${nandrootfstype} " \
53+ "consoleblank=0 " \
54+ "vt.global_cursor_default=0 " \
55+ "${extrabootargs}\0" \
56 "bootenv=uEnv.txt\0" \
57 "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
58 "importbootenv=echo Importing environment from mmc ...; " \
59@@ -263,10 +271,14 @@
60 "mpurate=${mpurate} " \
61 "buddy=${buddy} "\
62 "vram=${vram} " \
63+ "omapfb.vram=0:${vram} " \
64 "omapfb.mode=dvi:${dvimode} " \
65 "omapdss.def_disp=${defaultdisplay} " \
66 "root=${ramroot} " \
67- "rootfstype=${ramrootfstype}\0" \
68+ "rootfstype=${ramrootfstype} " \
69+ "consoleblank=0 " \
70+ "vt.global_cursor_default=0 " \
71+ "${extrabootargs}\0" \
72 "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
73 "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
74 "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
75--
761.7.10.4
77
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-12 21:50:54 +0000