From cb1f4569df3b0a2415a030b8a24add8032383728 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 3 Jun 2014 10:59:34 +0300 Subject: No need for RPi in BBMASK Offending recipe was removed from RPi meta layer Change-Id: If298067b8c9feba00099147c6512ffe84b9311dd Reviewed-by: Samuli Piippo --- conf/local.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/local.conf.sample b/conf/local.conf.sample index a9e1b34..1309835 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -275,7 +275,7 @@ CONF_VERSION = "1" INHERIT += "rm_work" -BBMASK = "meta-ti/recipes-misc|meta-raspberrypi/recipes-graphics/mesa/mesa_9.2.2.bbappend" +BBMASK = "meta-ti/recipes-misc" ACCEPT_FSL_EULA = "1" LICENSE_FLAGS_WHITELIST = "commercial" -- cgit v1.2.3-54-g00ecf From fcf5aebfc13d2b0bb10855a70e0cfab99e0fcd8e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 3 Jun 2014 10:57:55 +0300 Subject: BBB: enable USB serial kernel drivers Task-number: QTEE-595 Change-Id: I753dda500c60acbb198fc7c387ae165741c85bdf Reviewed-by: Kalle Viironen --- recipes/linux/linux-ti-staging/usb-serial.cfg | 4 ++++ recipes/linux/linux-ti-staging_3.12.bbappend | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 recipes/linux/linux-ti-staging/usb-serial.cfg 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 @@ +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_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..8df836c 100644 --- a/recipes/linux/linux-ti-staging_3.12.bbappend +++ b/recipes/linux/linux-ti-staging_3.12.bbappend @@ -20,4 +20,9 @@ ## ############################################################################# +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://usb-serial.cfg \ + " +KERNEL_CONFIG_FRAGMENTS += "usb-serial.cfg" KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb" -- cgit v1.2.3-54-g00ecf 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 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 030847c63a11c71b427c83efcd57c5aeca2ac9f7 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 3 Jun 2014 09:58:02 +0300 Subject: Include older Vivante drivers for Apalis iMX6 Apalis iMX6 is using older vivante GPU drivers that are available in the daisy branch of meta-fsl-arm. These files are copied over from meta-fsl-arm dora branch. Change-Id: I1a771a21b90ec2b064e3bdb3197302f3696e6aaf Reviewed-by: Andy Nichols --- recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 246 +++++++++++++++++++++ .../0001-change-header-path-to-HAL.patch | 30 +++ recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc | 12 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc | 12 + .../fix-conflicting-TLS-definition.patch | 31 +++ .../gc_hal_eglplatform-remove-xlib-undefs.patch | 34 +++ .../gpu-viv-bin-mx6q/gc_wayland_protocol.pc | 10 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc | 12 + .../gpu-viv-bin-mx6q/glesv1_cm_x11.pc | 12 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc | 12 + .../gpu-viv-bin-mx6q/glesv2_x11.pc | 12 + recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc | 12 + .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc | 12 + .../gpu-viv-bin-mx6q/wayland-egl.pc | 10 + .../gpu-viv-bin-mx6q/wayland-viv.pc | 10 + .../gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb | 11 + 16 files changed, 478 insertions(+) create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb 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 @@ +# Copyright (C) 2012-2013 Freescale Semiconductor +# Copyright (C) 2012-2013 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +DESCRIPTION = "GPU driver and apps for imx6" +SECTION = "libs" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', '', d)}" +PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 virtual/libopenvg" + +PE = "1" + +inherit fsl-eula-unpack + +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ + file://egl.pc \ + file://egl_x11.pc \ + file://glesv1_cm.pc \ + file://glesv1_cm_x11.pc \ + file://glesv2.pc \ + file://glesv2_x11.pc \ + file://vg.pc \ + file://vg_x11.pc \ + file://gc_wayland_protocol.pc \ + file://wayland-egl.pc \ + file://wayland-viv.pc \ + " + +PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \ + libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \ + libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \ + libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \ + libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \ + libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \ + libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \ + libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \ + libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \ + libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \ + libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \ + libvivante-dri-mx6 \ + libvivante-dfb-mx6 \ + libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \ + libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \ + libwayland-egl-mx6-dev \ +" + +# Skip package if it does not match the machine float-point type in use +python __anonymous () { + is_machine_hardfp = base_contains("TUNE_FEATURES", "callconvention-hard", True, False, d) + is_package_hardfp = d.getVar("PACKAGE_FP_TYPE", True) == "hardfp" + + if is_package_hardfp != is_machine_hardfp: + PN = d.getVar("PN", True) + PV = d.getVar("PV", True) + bb.debug(1, "Skipping %s (%s) as machine and package float-point does not match" % (PN, PV)) + raise bb.parse.SkipPackage("Package Float-Point is not compatible with the machine") +} + +USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" +USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}" +USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" + +# Inhibit warnings about files being stripped. +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" + +# FIXME: The provided binary doesn't provide soname. If in future BSP +# release the libraries are fixed, we can drop this hack. +REALSOLIBS := "${SOLIBS}" +SOLIBS = "${SOLIBSDEV}" + +# For the packages that make up the OpenGL interfaces, inject variables so that +# they don't get Debian-renamed (which would remove the -mx6 suffix). +# +# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have +# the source we cannot fix it. Disable the insane check for now. +python __anonymous() { + packages = d.getVar('PACKAGES', True).split() + for p in packages: + d.appendVar("INSANE_SKIP_%s" % p, " ldflags") + + for p in (("libegl", "libegl1"), ("libgl", "libgl1"), + ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"), + ("libgles3",)): + fullp = p[0] + "-mx6" + pkgs = " ".join(p) + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) + + # For -dev, the first element is both the Debian and original name + fullp += "-dev" + pkgs = p[0] + "-dev" + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) +} + +do_install () { + install -d ${D}${libdir} + install -d ${D}${includedir} + + cp -a ${S}/usr/lib/*.so* ${D}${libdir} + cp -axr ${S}/usr/include/* ${D}${includedir} + cp -axr ${S}/opt ${D} + + install -d ${D}${libdir}/pkgconfig + + # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb + if [ "${USE_X11}" = "yes" ]; then + cp -r ${S}/usr/lib/dri ${D}${libdir} + backend=x11 + + install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc + install -m 0644 ${WORKDIR}/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc + #FIXME: WL & X11 is not currently functional + #if [ "${USE_WL}" = "yes" ]; then + # install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc + # install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc + # install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc + #fi + elif [ "${USE_WL}" = "yes" ]; then + backend=wl + + install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc + install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc + install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc + install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc + else + install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc + install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc + install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc + install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc + + if [ "${USE_DFB}" = "yes" ]; then + cp -r ${S}/usr/lib/directfb-1.6-0 ${D}${libdir} + backend=dfb + else + # Regular framebuffer + backend=fb + fi + fi + + # We'll only have one backend here so we rename it to generic name + # and avoid rework in other packages, when possible + mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0 + ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2 + ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so + mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0 + ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1 + ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so + mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so + mv ${D}${libdir}/libVIVANTE-${backend}.so ${D}${libdir}/libVIVANTE.so + + for backend in wl x11 fb dfb; do + find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';' + done + + find ${D}${libdir} -type f -exec chmod 644 {} \; + find ${D}${includedir} -type f -exec chmod 644 {} \; +} + +S = "${WORKDIR}/${PN}-${PV}" + +FILES_${PN} += "/opt" +FILES_${PN}-dev = "${includedir}" +FILES_${PN}-dbg = "${libdir}/.debug /opt/viv_samples/*/*/.debug" + +FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}" +FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}" +FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}" + +# libEGL.so is used by some demo apps from Freescale +INSANE_SKIP_libegl-mx6 += "dev-so" +FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} " +FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" +FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}" + +FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}" +FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}" +FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}" + +FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}" +FILES_libgl-mx6-dev = "${libdir}/libGL${SOLIBSDEV}" +FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}" +RDEPENDS_libgl-mx6-dev = "libgl-mesa-dev" + +# libEGL needs to open libGLESv1.so +INSANE_SKIP_libgles-mx6 += "dev-so" +FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}" +FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc" +FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}" + +# libEGL needs to open libGLESv2.so +INSANE_SKIP_libgles2-mx6 += "dev-so" +FILES_libgles2-mx6 = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}" +FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc" +FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" +RDEPENDS_libgles2-mx6 = "libglslc-mx6" + +FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}" +FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}" +FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}" + +FILES_libopencl-mx6 = "${libdir}/libOpenCL${SOLIBS}" +FILES_libopencl-mx6-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}" +FILES_libopencl-mx6-dbg = "${libdir}/.debug/libOpenCL${SOLIBS}" +RDEPENDS_libopencl-mx6 = "libclc-mx6" + +FILES_libopenvg-mx6 = "${libdir}/libOpenVG*${SOLIBS}" +FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc" +FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}" + +FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}" +FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}" +FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}" + +FILES_libvivante-mx6 = "${libdir}/libVIVANTE${SOLIBS}" +FILES_libvivante-mx6-dev = "${libdir}/libVIVANTE${SOLIBSDEV}" +FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}" + +FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so" + +FILES_libvivante-dfb-mx6 = "${libdir}/directfb-1.6-0/gfxdrivers/libdirectfb_gal.so" + +INSANE_SKIP_libwayland-viv-mx6 += "dev-so" +FILES_libwayland-viv-mx6 = "${libdir}/libwayland-viv${REALSOLIBS} ${libdir}/libwayland-viv${SOLIBS}" +FILES_libwayland-viv-mx6-dev = "${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc" +FILES_libwayland-viv-mx6-dbg = "${libdir}/.debug/libwayland-viv${SOLIBS}" + +INSANE_SKIP_libgc-wayland-protocol-mx6 += "dev-so" +FILES_libgc-wayland-protocol-mx6 = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}" +FILES_libgc-wayland-protocol-mx6-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc" +FILES_libgc-wayland-protocol-mx6-dbg = "${libdir}/libgc_wayland_protocol${SOLIBS}" + +FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc" + +COMPATIBLE_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 @@ +From 1a4a35678ef70283d1a31835deecd39711a9db86 Mon Sep 17 00:00:00 2001 +From: Jeremy Stashluk +Date: Wed, 30 Jan 2013 13:16:53 -0500 +Subject: [PATCH] change header path to HAL + +The gpu-viv-bin-mx6q package from Freescale puts this header in the HAL +directory under the system. I think this is a problem in the LTIB release as +well. + +Upstream-Status: Pending + +Signed-off-by: Jeremy Stashluk + +--- + usr/include/gc_vdk_types.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h +=================================================================== +--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/gc_vdk_types.h ++++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h +@@ -39,7 +39,7 @@ extern "C" { + #endif + + #include +-#include "gc_hal_eglplatform_type.h" ++#include + + + /******************************************************************************* 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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: egl +Description: Vivante EGL library +Requires.private: +Version: 8.0 +Libs: -L${libdir} -lEGL +Libs.private: -lm -lpthread -ldl +Cflags: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: egl +Description: Vivante EGL library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lEGL +Libs.private: -lm -lpthread -ldl +Cflags: -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 @@ +Avoid conflicting types with Xorg newer code + +Upstream-Status: Pending +Signed-off-by: Otavio Salvador + +Index: gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h +=================================================================== +--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/HAL/gc_hal_base.h ++++ gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h +@@ -101,7 +101,7 @@ extern gcsPLS gcPLS; + typedef struct _gcsTLS * gcsTLS_PTR; + + typedef void (* gctTLS_DESTRUCTOR) ( +- gcsTLS_PTR TLS ++ gcsTLS_PTR pTLS + ); + + typedef struct _gcsTLS +@@ -648,10 +648,10 @@ gcoOS_SetPLSValue( + /* Get access to the thread local storage. */ + gceSTATUS + gcoOS_GetTLS( +- OUT gcsTLS_PTR * TLS ++ OUT gcsTLS_PTR * pTLS + ); + +- /* Copy the TLS from a source thread. */ ++ /* Copy the pTLS from a source thread. */ + gceSTATUS gcoOS_CopyTLS(IN gcsTLS_PTR Source); + + /* 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 @@ +From c59f9640d185759208f9d55a93b6602936dcb5e8 Mon Sep 17 00:00:00 2001 +From: Adrian Alonso +Date: Sat, 26 Jan 2013 17:52:04 -0600 +Subject: [PATCH 2/2] gc_hal_eglplatform: remove xlib undefs + +* Remove header undefs for Always and Status definitions + +Signed-off-by: Adrian Alonso +--- + usr/include/HAL/gc_hal_eglplatform.h | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/usr/include/HAL/gc_hal_eglplatform.h b/usr/include/HAL/gc_hal_eglplatform.h +index a968fe7..e80c65a 100644 +--- a/usr/include/HAL/gc_hal_eglplatform.h ++++ b/usr/include/HAL/gc_hal_eglplatform.h +@@ -341,14 +341,11 @@ typedef Pixmap HALNativePixmapType; + /* Rename some badly named X defines. */ + #ifdef Status + # define XStatus int +-# undef Status + #endif + #ifdef Always + # define XAlways 2 +-# undef Always + #endif + #ifdef CurrentTime +-# undef CurrentTime + # define XCurrentTime 0 + #endif + +-- +1.8.1 + 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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: gc_wayland_protocol +Description: Vivante Wayland Protocol Extension Library +Version: 0.1 +Cflags: -I${includedir} +Libs: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv1_cm +Description: Vivante OpenGL ES 1.1 CM library +Requires.private: +Version: 8.0 +Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL +Libs.private: -lm -lpthread -ldl +Cflags: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv1_cm +Description: Vivante OpenGL ES 1.1 CM library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL +Libs.private: -lm -lpthread -ldl +Cflags: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv2 +Description: Vivante OpenGL ES 2.0 library +Requires.private: +Version: 8.0 +Libs: -L${libdir} -lGLESv2 -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: glesv2 +Description: Vivante OpenGL ES 2.0 library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lGLESv2 -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: vg +Description: Vivante OpenVG 1.1 library +Requires.private: +Version: 8.0 +Libs: -L${libdir} -lOpenVG -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=/usr/lib +includedir=/usr/include + +Name: vg +Description: Vivante OpenVG 1.1 library +Requires.private: libdrm x11 xext xdamage xfixes xcb +Version: 8.0 +Libs: -L${libdir} -lOpenVG -lEGL -lGAL +Libs.private: -lpthread -lrt +Cflags: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: wayland-egl +Description: Bind the driver EGL to the Wayland API +Version: 1.0.0 +Libs: -L${libdir} -lEGL +Cflags: -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 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: Wayland Vivante Lib +Description: Wayland server side library for Vivante's EGL driver +Version: 0.1 +Cflags: -I${includedir}/wayland-viv +Libs: -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 @@ +# Copyright (C) 2013 Freescale Semiconductor +# Released under the MIT license (see COPYING.MIT for the terms) + +require gpu-viv-bin-mx6q.inc + +SRC_URI[md5sum] = "52f5ebbb6a9b5d0eafdb952246de584e" +SRC_URI[sha256sum] = "8b0386e13d4a7c770f8bc8e7a6119629c5ed379488dd5ef635bc92353f906003" + +PACKAGE_FP_TYPE = "hardfp" + +RDEPENDS_libgl-mx6-dev = "" -- 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(-) 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 85ac803a1d7311fae2487ccfad3aceb17289ff9d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 13 Jun 2014 11:44:53 +0300 Subject: Include toradex repository Toradex has lot's of dependencies, so BBMASK is updated to remove all recipes not suitable for us. Change-Id: Iddc4b7582fee2728f944e3dd803a7c9114932a62 Reviewed-by: Andy Nichols --- README | 4 ++++ b2qt-init-build-env | 4 ++++ conf/bblayers.conf.sample | 1 + conf/local.conf.sample | 1 + 4 files changed, 10 insertions(+) diff --git a/README b/README index e23e4e2..0134574 100644 --- a/README +++ b/README @@ -52,3 +52,7 @@ revision: HEAD URI: git://git.yoctoproject.org/meta-raspberrypi branch: daisy revision: HEAD + +URI: git://git.toradex.com/meta-toradex.git +branch: V2.2 +revision: HEAD diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 952e4a3..882e7fa 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -57,6 +57,10 @@ if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy fi +if [ ! -d ${BUILDDIR}/poky/meta-toradex ]; then + git clone git://git.toradex.com/meta-toradex.git ${BUILDDIR}/poky/meta-toradex -b V2.2 +fi + if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt fi 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 ?= " \ ##COREBASE##/meta-fsl-arm-extra \ ##COREBASE##/meta-ti \ ##COREBASE##/meta-raspberrypi \ + ##COREBASE##/meta-toradex \ ##COREBASE##/meta-openembedded/meta-oe \ ##COREBASE##/meta-b2qt \ " diff --git a/conf/local.conf.sample b/conf/local.conf.sample index 1309835..3874397 100644 --- a/conf/local.conf.sample +++ b/conf/local.conf.sample @@ -276,6 +276,7 @@ CONF_VERSION = "1" INHERIT += "rm_work" BBMASK = "meta-ti/recipes-misc" +BBMASK += "|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" ACCEPT_FSL_EULA = "1" LICENSE_FLAGS_WHITELIST = "commercial" -- cgit v1.2.3-54-g00ecf From cd55afb6bfd8c4abc29024095179d9599e832841 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 23 Jun 2014 13:14:44 +0300 Subject: adbd: add dependency to openssl for libcrypto Task-number: QTEE-667 Change-Id: I13a35db2f2f76623f2d6bde5782b16d087d00fc0 Reviewed-by: Gatis Paeglis --- recipes/adbd/adbd.bb | 1 + 1 file changed, 1 insertion(+) 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" SRCREV = "${PV}" RRECOMMENDS_${PN} += "kernel-module-g-ffs" +DEPENDS = "openssl" SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https \ file://adbd.patch;striplevel=2 \ -- 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 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 From e9c1ca70e7e9cafa6ab4c1c4a305bb9a0873d2fe Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 23 Jun 2014 10:19:40 +0300 Subject: adb: enabled network mode for toradex Currently USB connection does not work on Toradex Apalis iMX6, so defaulting to ethernet connection for the ADB. Change-Id: I06c2bb3fee8a0a4a7825678de4418d6debf1c5ac Reviewed-by: Kalle Viironen --- recipes/adbd/files/apalis-imx6/defaults | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 recipes/adbd/files/apalis-imx6/defaults 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 @@ +VENDOR=0x18d1 +PRODUCT=0x0000 +SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address) +USE_ETHERNET=yes -- cgit v1.2.3-54-g00ecf From 5ac75d0e59d231ce82b55405c0b5e8e919daca99 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 23 Jun 2014 15:11:53 +0300 Subject: image: include i2c-tools in image Change-Id: I47fa7efa46059deee646f862db01eeaa84284af8 Reviewed-by: Kalle Viironen --- recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb | 1 + 1 file changed, 1 insertion(+) 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} = "\ ldd \ binutils \ binutils-symlinks \ + i2c-tools \ " -- cgit v1.2.3-54-g00ecf From c4e685446e7ee1df940806c20de85eeeec81b8da Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 24 Jun 2014 10:06:02 +0300 Subject: bbb: correct path for kernel configure fragment Change-Id: Id061ebfdeb50708d48bb5eb34492f4d8e70e45cb Reviewed-by: Kalle Viironen --- recipes/linux/linux-ti-staging_3.12.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/linux/linux-ti-staging_3.12.bbappend b/recipes/linux/linux-ti-staging_3.12.bbappend index 8df836c..b2d6104 100644 --- a/recipes/linux/linux-ti-staging_3.12.bbappend +++ b/recipes/linux/linux-ti-staging_3.12.bbappend @@ -24,5 +24,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "\ file://usb-serial.cfg \ " -KERNEL_CONFIG_FRAGMENTS += "usb-serial.cfg" +KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg" KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb" -- cgit v1.2.3-54-g00ecf From bda5e004b96afb928ee49ff8529c1407386ba1f2 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 13 Jun 2014 11:52:30 +0300 Subject: toradex: enable FunctionFS module needed for adb Change-Id: I03f91962dc8f3a1e62118a486e8112f662dc5063 Reviewed-by: Kalle Viironen --- recipes/linux/linux-toradex-fsl_git.bbappend | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 recipes/linux/linux-toradex-fsl_git.bbappend diff --git a/recipes/linux/linux-toradex-fsl_git.bbappend b/recipes/linux/linux-toradex-fsl_git.bbappend new file mode 100644 index 0000000..adee8c4 --- /dev/null +++ b/recipes/linux/linux-toradex-fsl_git.bbappend @@ -0,0 +1,26 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +config_script () { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${S}/.config +} -- cgit v1.2.3-54-g00ecf From 965e22e4d2b339750915f0ddda7b6730fecb103a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 25 Jun 2014 08:55:43 +0300 Subject: Old libgles-omap3 packages were removed from meta-ti Remove bbappends for recipes that don't exists anymore, and use the latest package for BBB. Change-Id: Iacf1de8631e2e8218dc18e97bc6f993ad0d2da6f Reviewed-by: Gatis Paeglis --- recipes/libgles/libgles-omap3_4.05.00.03.bbappend | 39 ------------------- recipes/libgles/libgles-omap3_5.00.00.01.bbappend | 46 ----------------------- recipes/libgles/libgles-omap3_5.01.00.01.bbappend | 42 --------------------- recipes/libgles/libgles-omap3_5.01.01.01.bbappend | 42 +++++++++++++++++++++ 4 files changed, 42 insertions(+), 127 deletions(-) delete mode 100644 recipes/libgles/libgles-omap3_4.05.00.03.bbappend delete mode 100644 recipes/libgles/libgles-omap3_5.00.00.01.bbappend delete mode 100644 recipes/libgles/libgles-omap3_5.01.00.01.bbappend create mode 100644 recipes/libgles/libgles-omap3_5.01.01.01.bbappend diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/libgles/libgles-omap3_4.05.00.03.bbappend deleted file mode 100644 index 73a2408..0000000 --- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################# -## -## 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$ -## -############################################################################# - -BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" - -TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}" - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " file://0001-Add-GLchar-typedef.patch" - -LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" - -do_install_append() { - echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini -} - -pkg_postinst_${PN}_append() { -ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) -echo ${ESREV} > $D${sysconfdir}/powervr-esrev -} 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 @@ -############################################################################# -## -## 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$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" -BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" - -LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" - -do_install_append() { - echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini -} - -# Inhibit warnings about files being stripped. -INHIBIT_PACKAGE_SPLIT = "1" - -pkg_postinst_${PN}_append() { -ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) -echo ${ESREV} > $D${sysconfdir}/powervr-esrev -} - -RRECOMMENDS_${PN} = "omap3-sgx-modules" -RRECOMMENDS_${PN}-blitwsegl = "" -RRECOMMENDS_${PN}-flipwsegl = "" -RRECOMMENDS_${PN}-frontwsegl = "" -RRECOMMENDS_${PN}-linuxfbwsegl = "" diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend deleted file mode 100644 index 9a90577..0000000 --- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################# -## -## 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$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" -BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" - -LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" - -# Inhibit warnings about files being stripped. -INHIBIT_PACKAGE_STRIP = "1" - -pkg_postinst_${PN}_append() { -ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) -echo ${ESREV} > $D${sysconfdir}/powervr-esrev -} - -RRECOMMENDS_${PN} = "omap3-sgx-modules" -RRECOMMENDS_${PN}-blitwsegl = "" -RRECOMMENDS_${PN}-flipwsegl = "" -RRECOMMENDS_${PN}-frontwsegl = "" -RRECOMMENDS_${PN}-linuxfbwsegl = "" diff --git a/recipes/libgles/libgles-omap3_5.01.01.01.bbappend b/recipes/libgles/libgles-omap3_5.01.01.01.bbappend new file mode 100644 index 0000000..9a90577 --- /dev/null +++ b/recipes/libgles/libgles-omap3_5.01.01.01.bbappend @@ -0,0 +1,42 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +BINLOCATION_omap3 = "${S}/gfx_rel_es5.x" +BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" + +LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" + +# Inhibit warnings about files being stripped. +INHIBIT_PACKAGE_STRIP = "1" + +pkg_postinst_${PN}_append() { +ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) +echo ${ESREV} > $D${sysconfdir}/powervr-esrev +} + +RRECOMMENDS_${PN} = "omap3-sgx-modules" +RRECOMMENDS_${PN}-blitwsegl = "" +RRECOMMENDS_${PN}-flipwsegl = "" +RRECOMMENDS_${PN}-frontwsegl = "" +RRECOMMENDS_${PN}-linuxfbwsegl = "" -- cgit v1.2.3-54-g00ecf From b7ab4499e4daf15d3cc06e6c3032cc010c7c48aa Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 25 Jun 2014 08:58:39 +0300 Subject: beagleboard specific u-boot was removed from meta-ti Remove bbappend for the beagleboard specific u-boot. Since beagleboard is no longer a reference device, adding u-boot changes back to the latest u-boot is left for the customers. Change-Id: I752f67bcd0b9adef499cfc5aff5ea6304e569c33 Reviewed-by: Gatis Paeglis --- .../0001-beagle-change-default-kernel-args.patch | 77 ---------------------- recipes/u-boot/u-boot-beagleboard_2011.09.bbappend | 26 -------- 2 files changed, 103 deletions(-) delete mode 100644 recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch delete mode 100644 recipes/u-boot/u-boot-beagleboard_2011.09.bbappend 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 @@ -From 9ac6875931f5f9d073ca31cd6e1fb7636afb76bc Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Thu, 23 May 2013 14:37:10 +0300 -Subject: [PATCH] beagle: change default kernel args - -- default resolution to 800x600 -- increase VRAM for fb0 -- disable console blank -- disable console cursor blinking -- use extrabootargs ---- - include/configs/omap3_beagle.h | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h -index 1cc46dc..945e15e 100644 ---- a/include/configs/omap3_beagle.h -+++ b/include/configs/omap3_beagle.h -@@ -224,7 +224,7 @@ - "optargs=\0" \ - "camera=none\0" \ - "vram=12M\0" \ -- "dvimode=640x480MR-16@60\0" \ -+ "dvimode=800x600MR-16@60\0" \ - "defaultdisplay=dvi\0" \ - "mmcdev=0\0" \ - "mmcroot=/dev/mmcblk0p2 ro\0" \ -@@ -240,20 +240,28 @@ - "buddy2=${buddy2} "\ - "camera=${camera} "\ - "vram=${vram} " \ -+ "omapfb.vram=0:${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${mmcroot} " \ -- "rootfstype=${mmcrootfstype}\0" \ -+ "rootfstype=${mmcrootfstype} " \ -+ "consoleblank=0 " \ -+ "vt.global_cursor_default=0 " \ -+ "${extrabootargs}\0" \ - "nandargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "camera=${camera} "\ - "vram=${vram} " \ -+ "omapfb.vram=0:${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${nandroot} " \ -- "rootfstype=${nandrootfstype}\0" \ -+ "rootfstype=${nandrootfstype} " \ -+ "consoleblank=0 " \ -+ "vt.global_cursor_default=0 " \ -+ "${extrabootargs}\0" \ - "bootenv=uEnv.txt\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ - "importbootenv=echo Importing environment from mmc ...; " \ -@@ -263,10 +271,14 @@ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "vram=${vram} " \ -+ "omapfb.vram=0:${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${ramroot} " \ -- "rootfstype=${ramrootfstype}\0" \ -+ "rootfstype=${ramrootfstype} " \ -+ "consoleblank=0 " \ -+ "vt.global_cursor_default=0 " \ -+ "${extrabootargs}\0" \ - "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ - "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \ - "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \ --- -1.7.10.4 - diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend deleted file mode 100644 index f6fbde1..0000000 --- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################# -## -## 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$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += " \ - file://0001-beagle-change-default-kernel-args.patch \ - " -- cgit v1.2.3-54-g00ecf From 905a9cea99c050eef1d1c8189dcf8783dcf72443 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 25 Jun 2014 12:38:37 +0300 Subject: Use specific SHA1 from all of the meta repos Updates on the upstream meta repos can break b2qt-meta repo at anytime. When checking out meta repos, use the same version from which the released images were build. Change-Id: I669093747e79841148617e69aeb6dfea9b908b40 Reviewed-by: Kalle Viironen Reviewed-by: Gatis Paeglis --- README | 16 ++++++++-------- b2qt-init-build-env | 51 +++++++++++++++++++++++++-------------------------- 2 files changed, 33 insertions(+), 34 deletions(-) diff --git a/README b/README index 0134574..b3b55a4 100644 --- a/README +++ b/README @@ -28,31 +28,31 @@ OpenEmbedded and Yocto. This layer depends on: -URI: git://git.openembedded.org/openembedded-core +URI: git://git.yoctoproject.org/poky branch: daisy -revision: HEAD +revision: b0ce70ffa820c8b4069bdb413f7aa9db668b9428 URI: git://git.openembedded.org/meta-openembedded layer: meta-oe branch: daisy -revision: HEAD +revision: a6dcf6265822ca1484d991d10a3042e04a960cdb URI: git://git.yoctoproject.org/meta-ti branch: daisy -revision: HEAD +revision: 5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66 URI: git://git.yoctoproject.org/meta-fsl-arm branch: daisy -revision: HEAD +revision: f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b URI: git://github.com/Freescale/meta-fsl-arm-extra branch: daisy -revision: HEAD +revision: 029f535cfbc5746288c6129babb2d7679927a183 URI: git://git.yoctoproject.org/meta-raspberrypi branch: daisy -revision: HEAD +revision: cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55 URI: git://git.toradex.com/meta-toradex.git branch: V2.2 -revision: HEAD +revision: 371ea626f29a2a12294ab6ea30e36743a9e2f78f diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 882e7fa..bc747b8 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -33,33 +33,32 @@ mkdir -p ${1} DIR=$(readlink -f $(dirname $0)) BUILDDIR=$(readlink -f $1) -if [ ! -d ${BUILDDIR}/poky ]; then - git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b daisy -fi - -if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then - git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b daisy -fi - -if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then - git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b daisy -fi - -if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then - git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b daisy -fi - -if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then - git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b daisy -fi +checkout() { + REPO=$1 + REPODIR=${REPO##*/} + if [ ${REPODIR} != "poky" ]; then + REPODIR="poky/${REPODIR}" + fi + REF=${2%%:*} + SHA1=${2##*:} + if [ ! -d ${BUILDDIR}/${REPODIR} ]; then + mkdir ${BUILDDIR}/${REPODIR} + cd ${BUILDDIR}/${REPODIR} + git init + git remote add origin ${REPO} -f + git checkout ${REF} + git reset --hard ${SHA1} + cd - + fi +} -if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then - git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy -fi - -if [ ! -d ${BUILDDIR}/poky/meta-toradex ]; then - git clone git://git.toradex.com/meta-toradex.git ${BUILDDIR}/poky/meta-toradex -b V2.2 -fi +checkout git://git.yoctoproject.org/poky "daisy:b0ce70ffa820c8b4069bdb413f7aa9db668b9428" +checkout git://git.openembedded.org/meta-openembedded "daisy:a6dcf6265822ca1484d991d10a3042e04a960cdb" +checkout git://git.yoctoproject.org/meta-ti "daisy:5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66" +checkout git://git.yoctoproject.org/meta-fsl-arm "daisy:f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b" +checkout git://github.com/Freescale/meta-fsl-arm-extra "daisy:029f535cfbc5746288c6129babb2d7679927a183" +checkout git://git.yoctoproject.org/meta-raspberrypi "daisy:cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55" +checkout git://git.toradex.com/meta-toradex "V2.2:371ea626f29a2a12294ab6ea30e36743a9e2f78f" if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt -- cgit v1.2.3-54-g00ecf From 9e1f91f349e0ca11cd8a13d180f9f9557daa3ef8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 25 Jun 2014 16:55:21 +0300 Subject: linux-boundary: revert 1G/3G memory split configure Change in the linux-boundary defconfig caused video decode to break. Until imx-vpu gets fix for this, revert the memory split configure that broke it. Task-number: QTEE-675 Change-Id: I8dfc4d9540e23b0c02621605f6e23386d2f78d31 Reviewed-by: Kalle Viironen --- recipes/linux/linux-boundary_3.10.17.bbappend | 3 +++ 1 file changed, 3 insertions(+) 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() { echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig + + # fix imx-vpu break on video decoding + echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig } -- cgit v1.2.3-54-g00ecf