From 9d8cec2395c0e8876630b951a0cbca126aeff715 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 27 Mar 2014 15:58:16 +0200 Subject: sdk: include python modules for QtWebEngine support Some additional python modules are required to build QtWebEngine Task-number: QTEE-443 Change-Id: I47e0d9e8cf1b253e166684b32f2c7141a89749f5 Reviewed-by: Andy Nichols --- .../nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 9c92438..281204c 100644 --- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb +++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb @@ -30,6 +30,10 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb RDEPENDS_${PN} = "\ python-nativesdk \ python-subprocess-nativesdk \ + python-compiler-nativesdk \ + python-multiprocessing-nativesdk \ + python-shell-nativesdk \ + python-threading-nativesdk \ " -- cgit v1.2.3-54-g00ecf From ae6d3b0c8cd8a8851ac141c5427ea05a257fedba Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 6 May 2014 12:00:50 +0300 Subject: bootfs: correctly check for empty define Change-Id: Iece54b106059bfba07adfbd84a1ae76b9104b43f Reviewed-by: Kalle Viironen --- classes/bootfs-image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass index 5292965..cbb6c4c 100644 --- a/classes/bootfs-image.bbclass +++ b/classes/bootfs-image.bbclass @@ -26,7 +26,7 @@ BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}" BOOTFS_DEPENDS ?= "" fakeroot do_bootfs () { - if [ -n ${BOOTFS_CONTENT} ]; then + if [ -z "${BOOTFS_CONTENT}" ]; then exit 0 fi -- cgit v1.2.3-54-g00ecf From 5f01870ba086f2f840a7d570a60368cf42b728c0 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Mon, 12 May 2014 12:48:32 +0200 Subject: Add linux-firmware to b2qt default base packages This should enable the binary firmware blobs that come with the Linux kernel to be deployed to the device image which will enable any kernel modules that require them to work. This situation comes up frequently among wifi drivers (like ralink devices) and should allow us to support a more complete range of available USB wifi hardware. Change-Id: I8167e35e7d49e0823ad63d60ab5962fd049439e1 Reviewed-by: Gatis Paeglis Reviewed-by: Samuli Piippo --- recipes/packagegroup/packagegroup-b2qt-embedded-base.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index 0942a7e..e7f15bb 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -45,5 +45,6 @@ RDEPENDS_${PN} = "\ alsa-utils-amixer \ hunspell \ ca-certificates \ + linux-firmware \ ${MACHINE_EXTRA_INSTALL} \ " -- cgit v1.2.3-54-g00ecf From 317ae0bf0492694183fe09293628f2873f74ed3a Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Thu, 8 May 2014 14:02:04 +0200 Subject: Enable USB serial drivers Change-Id: I867ed5cb5e78fade52a56715f21a9fc2823a1ce8 Reviewed-by: Samuli Piippo --- recipes/linux/linux-am335x-psp_3.2.bbappend | 6 ++++++ recipes/linux/linux-boundary_3.0.35.bbappend | 6 ++++++ recipes/linux/linux-mainline_3.2.bbappend | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend index 313111b..fd7dd31 100644 --- a/recipes/linux/linux-am335x-psp_3.2.bbappend +++ b/recipes/linux/linux-am335x-psp_3.2.bbappend @@ -30,5 +30,11 @@ do_configure_append() { echo "CONFIG_DEVTMPFS=y" >> ${S}/.config + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${S}/.config + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${S}/.config + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${S}/.config + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${S}/.config + yes '' | oe_runmake oldconfig } diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend index 610dc4d..dd9420e 100644 --- a/recipes/linux/linux-boundary_3.0.35.bbappend +++ b/recipes/linux/linux-boundary_3.0.35.bbappend @@ -28,4 +28,10 @@ do_configure_prepend() { # FunctionFS for adb echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + 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 } diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend index 4c2cb59..9e195dc 100644 --- a/recipes/linux/linux-mainline_3.2.bbappend +++ b/recipes/linux/linux-mainline_3.2.bbappend @@ -29,6 +29,12 @@ do_configure_prepend() { echo "CONFIG_USB_FUNCTIONFS_RNDIS=n" >> ${WORKDIR}/defconfig echo "CONFIG_USB_FUNCTIONFS_GENERIC=y" >> ${WORKDIR}/defconfig + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + 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 + # Remove beagleboard logo if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then rm ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm -- cgit v1.2.3-54-g00ecf From 119c32c43cd29c782971094ad0ed351acc4efb85 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Mon, 12 May 2014 12:29:11 +0200 Subject: Remove irda, pcmcia, pci, 3g, nfc, zeroconf features from distro irda is support for infra-red communication pcmcia and pci are not relevant for any of the reference devices 3g adds Ofono to the stack and since we are not making phones, this is completely unnecessary waste of resources. zeroconf adds the Avahi daemon that is a rarely necessary zero-configuration networking manager. nfc is something we support, but none of the reference devices comes with this hardware, and would require an external device that has not been tested by us at all. It's likely that an end user that wants to use custom hardware will need to rebuild the stack anyway so they can just add any of these additional features back to their distro as necessary when they build their own stack. Change-Id: If3951a4170d94ed8db1d40c2bb2d47cf569dc36a Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 66ddcf1..14ee4ce 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -39,7 +39,7 @@ include conf/distro/include/${MACHINE}.conf SYSVINIT_ENABLED_GETTYS = "" -DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc" +DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs" POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch" DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" -- cgit v1.2.3-54-g00ecf From c646d169017decabe4280dbece71425d982e4411 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:07:07 +0300 Subject: Move to version 1.6 Change-Id: Ide554381076519287e874d5c6bb0b5b9de7060c6 Reviewed-by: Andy Nichols --- conf/distro/b2qt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 14ee4ce..8819c93 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -24,7 +24,7 @@ include conf/distro/poky.conf DISTRO = "b2qt" DISTRO_NAME = "Boot to Qt for Embedded Linux" -DISTRO_VERSION = "1.5" +DISTRO_VERSION = "1.6" SDK_VERSION := "${DISTRO_VERSION}" MAINTAINER = "B2Qt " -- cgit v1.2.3-54-g00ecf From c8dfbb1fb309f2c364948b5ea2b76808207fd3c1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 13 May 2014 09:49:36 +0300 Subject: Update used branch to daisy Readme and init script updated to use correct upstream branches Change-Id: Id38e09adcff67142009a8a5c4b563cabe1173433 Reviewed-by: Andy Nichols --- README | 14 +++++++------- b2qt-init-build-env | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README b/README index a2aa884..e23e4e2 100644 --- a/README +++ b/README @@ -29,26 +29,26 @@ OpenEmbedded and Yocto. This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: dora +branch: daisy revision: HEAD URI: git://git.openembedded.org/meta-openembedded layer: meta-oe -branch: dora +branch: daisy revision: HEAD URI: git://git.yoctoproject.org/meta-ti -branch: dora +branch: daisy revision: HEAD URI: git://git.yoctoproject.org/meta-fsl-arm -branch: dora +branch: daisy revision: HEAD -URI: git://github.com/Freescale/meta-fsl-arm-extra.git -branch: dora +URI: git://github.com/Freescale/meta-fsl-arm-extra +branch: daisy revision: HEAD URI: git://git.yoctoproject.org/meta-raspberrypi -branch: dora +branch: daisy revision: HEAD diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 8c4da01..952e4a3 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -34,27 +34,27 @@ DIR=$(readlink -f $(dirname $0)) BUILDDIR=$(readlink -f $1) if [ ! -d ${BUILDDIR}/poky ]; then - git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b dora + 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 dora + 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 dora + 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 dora + 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 dora + git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b daisy fi if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then - git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b dora + git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy fi if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then -- cgit v1.2.3-54-g00ecf From 41492a41524e7e3d04fde75774f29b0a86761819 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:04:46 +0300 Subject: libgles: inhibit QA error for files already being stripped Logic for INHIBIT_PACKAGE_DEBUG_SPLIT and INHIBIT_PACKAGE_STRIP was changed. Change-Id: Id0670aa1d56cf54187d7ad7cba05d22b4a0ccdb2 Reviewed-by: Andy Nichols --- recipes/libgles/libgles-omap3_4.09.00.01.bbappend | 2 +- recipes/libgles/libgles-omap3_5.00.00.01.bbappend | 2 +- recipes/libgles/libgles-omap3_5.01.00.01.bbappend | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 6a37c89..0646e73 100644 --- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend @@ -29,7 +29,7 @@ do_install_append() { } # Inhibit warnings about files being stripped. -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_STRIP = "1" pkg_postinst_${PN}_append() { ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend index 5446ffa..f0b5754 100644 --- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend @@ -32,7 +32,7 @@ do_install_append() { } # Inhibit warnings about files being stripped. -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_SPLIT = "1" pkg_postinst_${PN}_append() { ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend index 82bfdb2..9a90577 100644 --- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.01.00.01.bbappend @@ -28,7 +28,7 @@ BINLOCATION_beaglebone = "${S}/gfx_rel_es8.x" LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" # Inhibit warnings about files being stripped. -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_STRIP = "1" pkg_postinst_${PN}_append() { ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) -- cgit v1.2.3-54-g00ecf From 0c8417be83c71907f223a1666f0a2269942c9c1a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:14:22 +0300 Subject: nitrogen6x: use preferred version for kernel Need to change the preferred kernel version until it's done correctly in upstream. Change-Id: Ib75eb4731eb8f30c73353261e045d6fe5056a77a Reviewed-by: Andy Nichols --- conf/distro/include/nitrogen6x.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 2a64026..3dddcc1 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -31,6 +31,8 @@ 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" + MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ -- cgit v1.2.3-54-g00ecf From 2ee4cf43c8ac22da5b44bc7cdda93a3c9c6a4190 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:15:31 +0300 Subject: busybox: upstream version has changed Change-Id: If2e48d5dc3ccd16669ebb85076ca6a68473bb83e Reviewed-by: Andy Nichols --- recipes/busybox/busybox_1.21.1.bbappend | 46 --------------------------------- recipes/busybox/busybox_1.22.1.bbappend | 46 +++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 recipes/busybox/busybox_1.21.1.bbappend create mode 100644 recipes/busybox/busybox_1.22.1.bbappend diff --git a/recipes/busybox/busybox_1.21.1.bbappend b/recipes/busybox/busybox_1.21.1.bbappend deleted file mode 100644 index fe5d5ea..0000000 --- a/recipes/busybox/busybox_1.21.1.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}:" -SRC_URI += "\ - file://network.cfg \ - file://busybox-ifplugd.sh \ - file://ifplugd.action \ - " - -PACKAGES =+ "${PN}-ifplugd" -FILES_${PN}-ifplugd = "\ - ${sysconfdir}/init.d/busybox-ifplugd.sh \ - ${sysconfdir}/etc/ifplugd/ifplugd.action \ - " - -INITSCRIPT_PACKAGES += "${PN}-ifplugd" -INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh" - -RRECOMMENDS_${PN} += "${PN}-ifplugd" - -do_install_append () { - install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ - - install -d ${D}${sysconfdir}/ifplugd - install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ -} diff --git a/recipes/busybox/busybox_1.22.1.bbappend b/recipes/busybox/busybox_1.22.1.bbappend new file mode 100644 index 0000000..fe5d5ea --- /dev/null +++ b/recipes/busybox/busybox_1.22.1.bbappend @@ -0,0 +1,46 @@ +############################################################################# +## +## 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://network.cfg \ + file://busybox-ifplugd.sh \ + file://ifplugd.action \ + " + +PACKAGES =+ "${PN}-ifplugd" +FILES_${PN}-ifplugd = "\ + ${sysconfdir}/init.d/busybox-ifplugd.sh \ + ${sysconfdir}/etc/ifplugd/ifplugd.action \ + " + +INITSCRIPT_PACKAGES += "${PN}-ifplugd" +INITSCRIPT_NAME_${PN}-ifplugd = "busybox-ifplugd.sh" + +RRECOMMENDS_${PN} += "${PN}-ifplugd" + +do_install_append () { + install -m 0755 ${WORKDIR}/busybox-ifplugd.sh ${D}${sysconfdir}/init.d/ + + install -d ${D}${sysconfdir}/ifplugd + install -m 0755 ${WORKDIR}/ifplugd.action ${D}${sysconfdir}/ifplugd/ +} -- cgit v1.2.3-54-g00ecf From 2eaa24792624942fa185a0e6bc25ac133d48f8ea Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:15:57 +0300 Subject: gpu-viv-bin-mx6q: upstream version has changed Change-Id: Iec1d295bab4a3d883e2cd29935d084e1e9cdc4b6 Reviewed-by: Andy Nichols --- recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend | 1 + recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend delete mode 100644 recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend new file mode 100644 index 0000000..bed361e --- /dev/null +++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend @@ -0,0 +1 @@ +RDEPENDS_libgl-mx6-dev = "" diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend deleted file mode 100644 index bed361e..0000000 --- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend +++ /dev/null @@ -1 +0,0 @@ -RDEPENDS_libgl-mx6-dev = "" -- cgit v1.2.3-54-g00ecf From f50ebc6dfc356534e0325aadef55cde9ff9dc93f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:16:49 +0300 Subject: wpa-supplicant: upstream version has changed Change-Id: Iea1cb967d7a8afeb4dd34be1779971ad2451ff3c Reviewed-by: Andy Nichols --- recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend | 18 ------------------ recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend create mode 100644 recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend deleted file mode 100644 index 9a200b2..0000000 --- a/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend +++ /dev/null @@ -1,18 +0,0 @@ -do_install_append () { - install -d ${D}${includedir}/wpa-supplicant - - install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/ - - install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/ - install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/ -} - -FILES_${PN}-dev += "${includedir}/wpa-supplicant/*" - diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend new file mode 100644 index 0000000..9a200b2 --- /dev/null +++ b/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend @@ -0,0 +1,18 @@ +do_install_append () { + install -d ${D}${includedir}/wpa-supplicant + + install -m 0644 ${S}/src/common/wpa_ctrl.c ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/common/wpa_ctrl.h ${D}${includedir}/wpa-supplicant/ + + install -m 0644 ${S}/src/utils/build_config.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/common.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/includes.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/os.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/os_unix.c ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/trace.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/wpa_debug.h ${D}${includedir}/wpa-supplicant/ + install -m 0644 ${S}/src/utils/wpabuf.h ${D}${includedir}/wpa-supplicant/ +} + +FILES_${PN}-dev += "${includedir}/wpa-supplicant/*" + -- cgit v1.2.3-54-g00ecf From 343343291c20d9108bec986a882dca8f68d1ae8b Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:17:51 +0300 Subject: linux-yocto: upstream version has changed Change-Id: Ie53b19ffa20d3c448528bf562aa4b20274011261 Reviewed-by: Andy Nichols --- recipes/linux/linux-yocto_3.10.bbappend | 29 ----------------------------- recipes/linux/linux-yocto_3.14.bbappend | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 recipes/linux/linux-yocto_3.10.bbappend create mode 100644 recipes/linux/linux-yocto_3.14.bbappend diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.10.bbappend deleted file mode 100644 index 2645cbc..0000000 --- a/recipes/linux/linux-yocto_3.10.bbappend +++ /dev/null @@ -1,29 +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://snd_intel8x0.cfg \ - " - -KMACHINE_emulator = "qemux86" -COMPATIBLE_MACHINE_emulator = "emulator" diff --git a/recipes/linux/linux-yocto_3.14.bbappend b/recipes/linux/linux-yocto_3.14.bbappend new file mode 100644 index 0000000..2645cbc --- /dev/null +++ b/recipes/linux/linux-yocto_3.14.bbappend @@ -0,0 +1,29 @@ +############################################################################# +## +## 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://snd_intel8x0.cfg \ + " + +KMACHINE_emulator = "qemux86" +COMPATIBLE_MACHINE_emulator = "emulator" -- cgit v1.2.3-54-g00ecf From 30329f83d5d5d2e3bca663e1e9016025ccd76cf1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:18:36 +0300 Subject: libsdl: disable dependency to libglu Change-Id: I7e13486a6bd444557dbcb98ba794d6d335f25882 Reviewed-by: Andy Nichols --- recipes/libsdl/libsdl_1.2.15.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/recipes/libsdl/libsdl_1.2.15.bbappend index 36424fd..3a08249 100644 --- a/recipes/libsdl/libsdl_1.2.15.bbappend +++ b/recipes/libsdl/libsdl_1.2.15.bbappend @@ -1 +1 @@ -DEPENDS_remove = "virtual/libgl" +DEPENDS_remove = "virtual/libgl libglu" -- cgit v1.2.3-54-g00ecf From 320e03e97c777e4e63d0a1f45f75771182069e77 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:19:07 +0300 Subject: gstreamer: include icydemuxer needed for internet radios Change-Id: If3c7931f10b47f2d85e5b3f0f48573f0956621df Reviewed-by: Andy Nichols --- recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb index f6a8a54..5a076c1 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb @@ -35,6 +35,7 @@ RDEPENDS_${PN} = "\ gst-plugins-good-id3demux \ gst-plugins-good-auparse \ gst-plugins-good-isomp4 \ + gst-plugins-good-icydemux \ gst-plugins-ugly-rmdemux \ gst-plugins-ugly-asf \ gst-plugins-ugly-a52dec \ -- cgit v1.2.3-54-g00ecf From 75738f4153d7088a389500bdbdb1d92735a90498 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 13 May 2014 09:50:49 +0300 Subject: sabresd: add function fs support to sabresd kernel Function FS needed for the adb connection, include kernel support in the SABRE SD kernel. Change-Id: I00f635aff7e71a097941dc8b1ecfb07a4ee3177f Reviewed-by: Andy Nichols --- recipes/linux/linux-imx_3.10.17.bbappend | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 recipes/linux/linux-imx_3.10.17.bbappend diff --git a/recipes/linux/linux-imx_3.10.17.bbappend b/recipes/linux/linux-imx_3.10.17.bbappend new file mode 100644 index 0000000..082c431 --- /dev/null +++ b/recipes/linux/linux-imx_3.10.17.bbappend @@ -0,0 +1,32 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +do_configure_prepend() { + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + 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 +} -- cgit v1.2.3-54-g00ecf From 7c9a43aa044ab46279f2ec33c92fcb91fc1b7202 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 May 2014 11:34:21 +0300 Subject: Include support for Freescale SABRE SD (iMX6Q) Change-Id: Iaa6004f4c9e3d0ec1948d18561bcf0ead81cb7c4 Reviewed-by: Andy Nichols --- conf/distro/include/imx6qsabresd.conf | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 conf/distro/include/imx6qsabresd.conf diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf new file mode 100644 index 0000000..1298ee4 --- /dev/null +++ b/conf/distro/include/imx6qsabresd.conf @@ -0,0 +1,49 @@ +############################################################################# +## +## 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 ext3 sdcard" + +BOOTFS_CONTENT = "\ + ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ + ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \ + ${KERNEL_IMAGETYPE}-imx6q-sabresd-hdcp.dtb:imx6q-sabresd-hdcp.dtb \ + ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \ + u-boot-${MACHINE}.imx:u-boot.imx \ + " +BOOTFS_DEPENDS = "u-boot:do_deploy" + +MACHINE_EXTRA_INSTALL = "\ + libgal-mx6 \ + libegl-mx6 \ + libgles2-mx6 \ + gst-fsl-plugin \ + " + +MACHINE_EXTRA_INSTALL_SDK = " \ + libgal-mx6 \ + libegl-mx6 \ + libegl-mx6-dev \ + libgles2-mx6 \ + libgles2-mx6-dev \ + " + +ADB_PRODUCTID = "0x0000" -- cgit v1.2.3-54-g00ecf From b20a3f58ee264318fa351e449821ce76035df5ef Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:16:26 +0300 Subject: mesa: remove from emulator image Mesa is no longer needed in emulator image since we are using qtglesstreaming Change-Id: I1b16cc11b73e58f7c489db77ed161aabff5b1061 Reviewed-by: Andy Nichols --- conf/distro/include/emulator.conf | 4 - ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ---- ...0001-fix-xlib-dependency-from-pipe-loader.patch | 26 -- ...move-the-power-of-two-sizeof-struct-cmd_b.patch | 42 --- ...ate-NativeDisplayType-depending-on-config.patch | 358 --------------------- recipes/mesa/mesa/fix-glsl-cross.patch | 43 --- recipes/mesa/mesa/glapi.patch | 109 ------- recipes/mesa/mesa_9.1.6.bbappend | 26 -- 8 files changed, 673 deletions(-) delete mode 100644 recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch delete mode 100644 recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch delete mode 100644 recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch delete mode 100644 recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch delete mode 100644 recipes/mesa/mesa/fix-glsl-cross.patch delete mode 100644 recipes/mesa/mesa/glapi.patch delete mode 100644 recipes/mesa/mesa_9.1.6.bbappend diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index dee1df3..9b22383 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -32,12 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" MACHINE_EXTRA_INSTALL = "\ - libegl-mesa \ - libgles2-mesa \ mount-vboxsf \ " MACHINE_EXTRA_INSTALL_SDK = "\ - libegl-mesa-dev \ - libgles2-mesa-dev \ " diff --git a/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch deleted file mode 100644 index 9f7002a..0000000 --- a/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 877b8ea9a79d1d51f8e6b032801731538590d39e Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -Date: Tue, 4 Jun 2013 06:04:44 -0700 -Subject: [PATCH] configure: Avoid use of AC_CHECK_FILE for cross compiling - -The AC_CHECK_FILE macro can't be used for cross compiling as it will -result in "error: cannot check for file existence when cross compiling". -Replace it with the AS_IF macro. - -Upstream-Status: Submitted -http://lists.freedesktop.org/archives/mesa-dev/2013-June/040168.html - -Signed-off-by: Jonathan Liu -Signed-off-by: Martin Jansa ---- - configure.ac | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 36065f1..2b4a374 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1694,8 +1694,8 @@ if test "x$enable_gallium_llvm" = xyes; then - CLANG_LIBDIR=${LLVM_LIBDIR} - fi - CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} -- AC_CHECK_FILE("$CLANG_RESOURCE_DIR/include/stddef.h",, -- AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])) -+ AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"], -+ [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])]) - fi - else - MESA_LLVM=0 -@@ -1912,7 +1912,7 @@ if test "x$MESA_LLVM" != x0; then - if test "x$with_llvm_shared_libs" = xyes; then - dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` -- AC_CHECK_FILE("$LLVM_LIBDIR/lib$LLVM_SO_NAME.so", llvm_have_one_so=yes,) -+ AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"], [llvm_have_one_so=yes]) - - if test "x$llvm_have_one_so" = xyes; then - dnl LLVM was built using auto*, so there is only one shared object. -@@ -1920,8 +1920,8 @@ if test "x$MESA_LLVM" != x0; then - else - dnl If LLVM was built with CMake, there will be one shared object per - dnl component. -- AC_CHECK_FILE("$LLVM_LIBDIR/libLLVMTarget.so",, -- AC_MSG_ERROR([Could not find llvm shared libraries: -+ AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.so"], -+ [AC_MSG_ERROR([Could not find llvm shared libraries: - Please make sure you have built llvm with the --enable-shared option - and that your llvm libraries are installed in $LLVM_LIBDIR - If you have installed your llvm libraries to a different directory you -@@ -1932,7 +1932,7 @@ if test "x$MESA_LLVM" != x0; then - --enable-opencl - If you do not want to build with llvm shared libraries and instead want to - use llvm static libraries then remove these options from your configure -- invocation and reconfigure.])) -+ invocation and reconfigure.])]) - - dnl We don't need to update LLVM_LIBS in this case because the LLVM - dnl install uses a shared object for each compoenent and we have --- -1.8.2.1 - diff --git a/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch b/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch deleted file mode 100644 index a9f2394..0000000 --- a/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 17d94fa96f095571651f0260378785c2a801ff16 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Thu, 27 Jun 2013 14:49:54 +0300 -Subject: [PATCH] fix xlib dependency from pipe-loader - ---- - src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -index c2b78c6..8c59c83 100644 ---- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -@@ -31,7 +31,9 @@ - #include "util/u_dl.h" - #include "sw/null/null_sw_winsys.h" - #include "target-helpers/inline_sw_helper.h" -+#ifdef X11 - #include "state_tracker/xlib_sw_winsys.h" -+#endif - - struct pipe_loader_sw_device { - struct pipe_loader_device base; --- -1.7.10.4 - diff --git a/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch deleted file mode 100644 index b74fddc..0000000 --- a/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9915636fb8afe75ee2e8e013e4f495a4cb937afb Mon Sep 17 00:00:00 2001 -From: Brian Paul -Date: Wed, 6 Mar 2013 16:57:20 -0700 -Subject: [PATCH] llvmpipe: remove the power of two sizeof(struct cmd_block) - assertion -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It fails on 32-bit systems (I only tested on 64-bit). Power of two -size isn't required, so just remove the assertion. - -Reviewed-by: José Fonseca - -Upstream-Status: Backport -http://cgit.freedesktop.org/mesa/mesa/commit/?id=9915636fb8afe75ee2e8e013e4f495a4cb937afb - ---- - src/gallium/drivers/llvmpipe/lp_scene.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c -index dd0943e..a0912eb 100644 ---- a/src/gallium/drivers/llvmpipe/lp_scene.c -+++ b/src/gallium/drivers/llvmpipe/lp_scene.c -@@ -76,13 +76,6 @@ lp_scene_create( struct pipe_context *pipe ) - assert(maxCommandBytes < LP_SCENE_MAX_SIZE); - /* We'll also need space for at least one other data block */ - assert(maxCommandPlusData <= LP_SCENE_MAX_SIZE); -- -- /* Ideally, the size of a cmd_block object will be a power of two -- * in order to avoid wasting space when we allocation them from -- * data blocks (which are power of two also). -- */ -- assert(sizeof(struct cmd_block) == -- util_next_power_of_two(sizeof(struct cmd_block))); - } - #endif - --- -1.8.3 - diff --git a/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch b/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch deleted file mode 100644 index 47ba167..0000000 --- a/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch +++ /dev/null @@ -1,358 +0,0 @@ -From d52a7ec5dcdf3936bd727b854831efb90acfd2ba Mon Sep 17 00:00:00 2001 -From: Daniel Stone -Date: Fri, 24 May 2013 17:20:27 +0100 -Subject: [PATCH] EGL: Mutate NativeDisplayType depending on config - -If we go through ./configure without enabling X11 anywhere, then set the -fallback types for EGL NativeDisplay and friends, rather than assuming -X11/Xlib. - -Signed-off-by: Daniel Stone ---- - configure.ac | 9 +++ - include/EGL/eglplatform.h | 146 ------------------------------------------ - include/EGL/eglplatform.h.in | 146 ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 155 insertions(+), 146 deletions(-) - delete mode 100644 include/EGL/eglplatform.h - create mode 100644 include/EGL/eglplatform.h.in - -diff --git a/configure.ac b/configure.ac -index 4a98996..6fa77da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1576,12 +1576,20 @@ fi - - EGL_PLATFORMS="$egl_platforms" - -+if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then -+ MESA_EGL_NO_X11_HEADERS=0 -+else -+ MESA_EGL_NO_X11_HEADERS=1 -+fi -+ - AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1) - -+AC_SUBST([MESA_EGL_NO_X11_HEADERS]) -+ - AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") - AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") - -@@ -2053,6 +2061,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" - - dnl Substitute the config - AC_CONFIG_FILES([Makefile -+ include/EGL/eglplatform.h - src/Makefile - src/egl/Makefile - src/egl/drivers/Makefile -diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h -deleted file mode 100644 -index 17fdc61..0000000 ---- a/include/EGL/eglplatform.h -+++ /dev/null -@@ -1,146 +0,0 @@ --#ifndef __eglplatform_h_ --#define __eglplatform_h_ -- --/* --** Copyright (c) 2007-2009 The Khronos Group Inc. --** --** Permission is hereby granted, free of charge, to any person obtaining a --** copy of this software and/or associated documentation files (the --** "Materials"), to deal in the Materials without restriction, including --** without limitation the rights to use, copy, modify, merge, publish, --** distribute, sublicense, and/or sell copies of the Materials, and to --** permit persons to whom the Materials are furnished to do so, subject to --** the following conditions: --** --** The above copyright notice and this permission notice shall be included --** in all copies or substantial portions of the Materials. --** --** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, --** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY --** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, --** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE --** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. --*/ -- --/* Platform-specific types and definitions for egl.h -- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -- * -- * Adopters may modify khrplatform.h and this file to suit their platform. -- * You are encouraged to submit all modifications to the Khronos group so that -- * they can be included in future versions of this file. Please submit changes -- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -- * by filing a bug against product "EGL" component "Registry". -- */ -- --#include -- --/* Macros used in EGL function prototype declarations. -- * -- * EGL functions should be prototyped as: -- * -- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -- * -- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -- */ -- --#ifndef EGLAPI --#define EGLAPI KHRONOS_APICALL --#endif -- --#ifndef EGLAPIENTRY --#define EGLAPIENTRY KHRONOS_APIENTRY --#endif --#define EGLAPIENTRYP EGLAPIENTRY* -- --/* The types NativeDisplayType, NativeWindowType, and NativePixmapType -- * are aliases of window-system-dependent types, such as X Display * or -- * Windows Device Context. They must be defined in platform-specific -- * code below. The EGL-prefixed versions of Native*Type are the same -- * types, renamed in EGL 1.3 so all types in the API start with "EGL". -- * -- * Khronos STRONGLY RECOMMENDS that you use the default definitions -- * provided below, since these changes affect both binary and source -- * portability of applications using EGL running on different EGL -- * implementations. -- */ -- --#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ --#ifndef WIN32_LEAN_AND_MEAN --#define WIN32_LEAN_AND_MEAN 1 --#endif --#include -- --typedef HDC EGLNativeDisplayType; --typedef HBITMAP EGLNativePixmapType; --typedef HWND EGLNativeWindowType; -- --#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ -- --typedef int EGLNativeDisplayType; --typedef void *EGLNativeWindowType; --typedef void *EGLNativePixmapType; -- --#elif defined(WL_EGL_PLATFORM) -- --typedef struct wl_display *EGLNativeDisplayType; --typedef struct wl_egl_pixmap *EGLNativePixmapType; --typedef struct wl_egl_window *EGLNativeWindowType; -- --#elif defined(__GBM__) -- --typedef struct gbm_device *EGLNativeDisplayType; --typedef struct gbm_bo *EGLNativePixmapType; --typedef void *EGLNativeWindowType; -- --#elif defined(ANDROID) /* Android */ -- --struct ANativeWindow; --struct egl_native_pixmap_t; -- --typedef struct ANativeWindow *EGLNativeWindowType; --typedef struct egl_native_pixmap_t *EGLNativePixmapType; --typedef void *EGLNativeDisplayType; -- --#elif defined(__unix__) -- --#ifdef MESA_EGL_NO_X11_HEADERS -- --typedef void *EGLNativeDisplayType; --typedef khronos_uint32_t EGLNativePixmapType; --typedef khronos_uint32_t EGLNativeWindowType; -- --#else -- --/* X11 (tentative) */ --#include --#include -- --typedef Display *EGLNativeDisplayType; --typedef Pixmap EGLNativePixmapType; --typedef Window EGLNativeWindowType; -- --#endif /* MESA_EGL_NO_X11_HEADERS */ -- --#else --#error "Platform not recognized" --#endif -- --/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ --typedef EGLNativeDisplayType NativeDisplayType; --typedef EGLNativePixmapType NativePixmapType; --typedef EGLNativeWindowType NativeWindowType; -- -- --/* Define EGLint. This must be a signed integral type large enough to contain -- * all legal attribute names and values passed into and out of EGL, whether -- * their type is boolean, bitmask, enumerant (symbolic constant), integer, -- * handle, or other. While in general a 32-bit integer will suffice, if -- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit -- * integer type. -- */ --typedef khronos_int32_t EGLint; -- --#endif /* __eglplatform_h */ -diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in -new file mode 100644 -index 0000000..5126c92 ---- /dev/null -+++ b/include/EGL/eglplatform.h.in -@@ -0,0 +1,146 @@ -+#ifndef __eglplatform_h_ -+#define __eglplatform_h_ -+ -+/* -+** Copyright (c) 2007-2009 The Khronos Group Inc. -+** -+** Permission is hereby granted, free of charge, to any person obtaining a -+** copy of this software and/or associated documentation files (the -+** "Materials"), to deal in the Materials without restriction, including -+** without limitation the rights to use, copy, modify, merge, publish, -+** distribute, sublicense, and/or sell copies of the Materials, and to -+** permit persons to whom the Materials are furnished to do so, subject to -+** the following conditions: -+** -+** The above copyright notice and this permission notice shall be included -+** in all copies or substantial portions of the Materials. -+** -+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -+*/ -+ -+/* Platform-specific types and definitions for egl.h -+ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -+ * -+ * Adopters may modify khrplatform.h and this file to suit their platform. -+ * You are encouraged to submit all modifications to the Khronos group so that -+ * they can be included in future versions of this file. Please submit changes -+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -+ * by filing a bug against product "EGL" component "Registry". -+ */ -+ -+#include -+ -+/* Macros used in EGL function prototype declarations. -+ * -+ * EGL functions should be prototyped as: -+ * -+ * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -+ * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -+ * -+ * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -+ */ -+ -+#ifndef EGLAPI -+#define EGLAPI KHRONOS_APICALL -+#endif -+ -+#ifndef EGLAPIENTRY -+#define EGLAPIENTRY KHRONOS_APIENTRY -+#endif -+#define EGLAPIENTRYP EGLAPIENTRY* -+ -+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType -+ * are aliases of window-system-dependent types, such as X Display * or -+ * Windows Device Context. They must be defined in platform-specific -+ * code below. The EGL-prefixed versions of Native*Type are the same -+ * types, renamed in EGL 1.3 so all types in the API start with "EGL". -+ * -+ * Khronos STRONGLY RECOMMENDS that you use the default definitions -+ * provided below, since these changes affect both binary and source -+ * portability of applications using EGL running on different EGL -+ * implementations. -+ */ -+ -+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ -+#ifndef WIN32_LEAN_AND_MEAN -+#define WIN32_LEAN_AND_MEAN 1 -+#endif -+#include -+ -+typedef HDC EGLNativeDisplayType; -+typedef HBITMAP EGLNativePixmapType; -+typedef HWND EGLNativeWindowType; -+ -+#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ -+ -+typedef int EGLNativeDisplayType; -+typedef void *EGLNativeWindowType; -+typedef void *EGLNativePixmapType; -+ -+#elif defined(WL_EGL_PLATFORM) -+ -+typedef struct wl_display *EGLNativeDisplayType; -+typedef struct wl_egl_pixmap *EGLNativePixmapType; -+typedef struct wl_egl_window *EGLNativeWindowType; -+ -+#elif defined(__GBM__) -+ -+typedef struct gbm_device *EGLNativeDisplayType; -+typedef struct gbm_bo *EGLNativePixmapType; -+typedef void *EGLNativeWindowType; -+ -+#elif defined(ANDROID) /* Android */ -+ -+struct ANativeWindow; -+struct egl_native_pixmap_t; -+ -+typedef struct ANativeWindow *EGLNativeWindowType; -+typedef struct egl_native_pixmap_t *EGLNativePixmapType; -+typedef void *EGLNativeDisplayType; -+ -+#elif defined(__unix__) -+ -+#if @MESA_EGL_NO_X11_HEADERS@ -+ -+typedef void *EGLNativeDisplayType; -+typedef khronos_uint32_t EGLNativePixmapType; -+typedef khronos_uint32_t EGLNativeWindowType; -+ -+#else -+ -+/* X11 (tentative) */ -+#include -+#include -+ -+typedef Display *EGLNativeDisplayType; -+typedef Pixmap EGLNativePixmapType; -+typedef Window EGLNativeWindowType; -+ -+#endif /* MESA_EGL_NO_X11_HEADERS */ -+ -+#else -+#error "Platform not recognized" -+#endif -+ -+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ -+typedef EGLNativeDisplayType NativeDisplayType; -+typedef EGLNativePixmapType NativePixmapType; -+typedef EGLNativeWindowType NativeWindowType; -+ -+ -+/* Define EGLint. This must be a signed integral type large enough to contain -+ * all legal attribute names and values passed into and out of EGL, whether -+ * their type is boolean, bitmask, enumerant (symbolic constant), integer, -+ * handle, or other. While in general a 32-bit integer will suffice, if -+ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit -+ * integer type. -+ */ -+typedef khronos_int32_t EGLint; -+ -+#endif /* __eglplatform_h */ --- -1.7.10.4 - diff --git a/recipes/mesa/mesa/fix-glsl-cross.patch b/recipes/mesa/mesa/fix-glsl-cross.patch deleted file mode 100644 index 34226ea..0000000 --- a/recipes/mesa/mesa/fix-glsl-cross.patch +++ /dev/null @@ -1,43 +0,0 @@ -The target libtool is used when building host binaries, which predictably -doesn't work. - -Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=44618) -Signed-off-by: Jonathan Liu -Signed-off-by: Ross Burton - -diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am -index e11a17f..8ebe0a2 100644 ---- a/src/glsl/builtin_compiler/Makefile.am -+++ b/src/glsl/builtin_compiler/Makefile.am -@@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS) - include ../Makefile.sources - - noinst_PROGRAMS = builtin_compiler -+ -+if !CROSS_COMPILING - noinst_LTLIBRARIES = libglslcore.la libglcpp.la - - libglcpp_la_SOURCES = \ -@@ -73,6 +75,7 @@ libglcpp_la_SOURCES = \ - libglslcore_la_SOURCES = \ - $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ - $(LIBGLSL_FILES) -+endif - - builtin_compiler_SOURCES = \ - $(top_srcdir)/src/mesa/main/hash_table.c \ -@@ -81,4 +84,14 @@ builtin_compiler_SOURCES = \ - $(top_srcdir)/src/mesa/program/symbol_table.c \ - $(BUILTIN_COMPILER_CXX_FILES) \ - $(GLSL_COMPILER_CXX_FILES) -+ -+if CROSS_COMPILING -+builtin_compiler_SOURCES += \ -+ $(LIBGLCPP_GENERATED_FILES) \ -+ $(LIBGLCPP_FILES) \ -+ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ -+ $(LIBGLSL_FILES) -+builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS) -+else - builtin_compiler_LDADD = libglslcore.la libglcpp.la -+endif diff --git a/recipes/mesa/mesa/glapi.patch b/recipes/mesa/mesa/glapi.patch deleted file mode 100644 index 74cac0b..0000000 --- a/recipes/mesa/mesa/glapi.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 5ea43e65498505fc5d11d63668cda165146eb55b Mon Sep 17 00:00:00 2001 -From: Andreas Boll -Date: Thu, 30 May 2013 11:32:43 +0000 -Subject: glapi: Add some missing static_dispatch="false" annotations to es_EXT.xml - -This fixes the following build errors on powerpc: - - CC glapi_dispatch.lo - In file included from glapi_dispatch.c:90:0: - ../../../../../src/mapi/glapi/glapitemp.h:1640:1: error: no previous - prototype for 'glReadBufferNV' [-Werror=missing-prototypes] - ../../../../../src/mapi/glapi/glapitemp.h:4198:1: error: no previous - prototype for 'glDrawBuffersNV' [-Werror=missing-prototypes] - ../../../../../src/mapi/glapi/glapitemp.h:6377:1: error: no previous - prototype for 'glFlushMappedBufferRangeEXT' - [-Werror=missing-prototypes] - ../../../../../src/mapi/glapi/glapitemp.h:6389:1: error: no previous - prototype for 'glMapBufferRangeEXT' [-Werror=missing-prototypes] - ../../../../../src/mapi/glapi/glapitemp.h:6401:1: error: no previous - prototype for 'glBindVertexArrayOES' [-Werror=missing-prototypes] - ../../../../../src/mapi/glapi/glapitemp.h:6413:1: error: no previous - prototype for 'glDeleteVertexArraysOES' [-Werror=missing-prototypes] - ../../../../../src/mapi/glapi/glapitemp.h:6433:1: error: no previous - prototype for 'glGenVertexArraysOES' [-Werror=missing-prototypes] - ../../../../../src/mapi/glapi/glapitemp.h:6445:1: error: no previous - prototype for 'glIsVertexArrayOES' [-Werror=missing-prototypes] - -NOTE: This is a candidate for the 9.0 and 9.1 branches. - -Reviewed-by: Maarten Lankhorst -Reviewed-by: Brian Paul ---- -diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml -index ff378ac..f412333 100644 ---- a/src/mapi/glapi/gen/es_EXT.xml -+++ b/src/mapi/glapi/gen/es_EXT.xml -@@ -689,22 +689,25 @@ - - - -- -+ - - - - -+ static_dispatch="false" es2="2.0"> - - - - -- -+ - - - - -- -+ - - - -@@ -779,7 +782,8 @@ - - - -- -+ - - - -@@ -787,7 +791,8 @@ - - - -- -+ - - - -@@ -815,8 +820,8 @@ - - - -- -+ - - - -@@ -825,7 +830,7 @@ - - - -+ static_dispatch="false" es1="1.0" es2="2.0"> - - - --- -cgit v0.9.0.2-2-gbebe - diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend deleted file mode 100644 index 627f70b..0000000 --- a/recipes/mesa/mesa_9.1.6.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$ -## -############################################################################# - -EGL_PLATFORMS = "fbdev" -DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" -DRIDRIVERS_append += "swrast" -EXTRA_OECONF += "--with-dri-drivers=""" -- cgit v1.2.3-54-g00ecf From f64f1f26dfad731f4506107ba62eb745831d323d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 14 May 2014 11:42:00 +0300 Subject: imx6: kernel update for nitrogen6x Correctly append new kernel configs for the updated kernel version and include device tree files in the boot image. Change-Id: I3d7c826e3e96338048e82b23a6723212e4adbd03 Reviewed-by: Kalle Viironen Reviewed-by: Andy Nichols --- conf/distro/include/nitrogen6x.conf | 3 +++ recipes/linux/linux-boundary_3.0.35.bbappend | 37 --------------------------- recipes/linux/linux-boundary_3.10.17.bbappend | 37 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 recipes/linux/linux-boundary_3.0.35.bbappend create mode 100644 recipes/linux/linux-boundary_3.10.17.bbappend diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 3dddcc1..8066936 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -24,6 +24,9 @@ IMAGE_FSTYPES = "tar.gz" BOOTFS_CONTENT = "\ ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \ + ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \ + ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \ + ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \ 6x_bootscript-${MACHINE}:6x_bootscript \ 6x_upgrade-${MACHINE}:6x_upgrade \ " diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend deleted file mode 100644 index dd9420e..0000000 --- a/recipes/linux/linux-boundary_3.0.35.bbappend +++ /dev/null @@ -1,37 +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$ -## -############################################################################# - - -do_configure_prepend() { - # Use multitouch protocol for touchscreen that support it - echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig - echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig - - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - 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 -} diff --git a/recipes/linux/linux-boundary_3.10.17.bbappend b/recipes/linux/linux-boundary_3.10.17.bbappend new file mode 100644 index 0000000..dd9420e --- /dev/null +++ b/recipes/linux/linux-boundary_3.10.17.bbappend @@ -0,0 +1,37 @@ +############################################################################# +## +## 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$ +## +############################################################################# + + +do_configure_prepend() { + # Use multitouch protocol for touchscreen that support it + echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig + echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig + + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + 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 +} -- cgit v1.2.3-54-g00ecf From 97eb833c35d19c049bc2d19544165de0a9b340b6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 15:54:28 +0300 Subject: sabre: updated kernel arguments - disabled cursor blinking and blanking - activated hdmi output - use i2c probe to detect if hdmi is used Change-Id: I7c1b98c305d3c2c9ab098ba3cfba38ff2b6b78d1 Reviewed-by: Kalle Viironen --- ...001-Updated-kernel-arguments-for-sabre-sd.patch | 133 +++++++++++++++++++++ recipes/u-boot/u-boot-fslc_2014.01.bbappend | 26 ++++ 2 files changed, 159 insertions(+) create mode 100644 recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch create mode 100644 recipes/u-boot/u-boot-fslc_2014.01.bbappend diff --git a/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch new file mode 100644 index 0000000..59a4505 --- /dev/null +++ b/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch @@ -0,0 +1,133 @@ +From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 9 May 2014 10:23:50 +0300 +Subject: [PATCH] Updated kernel arguments for sabre sd + +- Enable I2C +- detect if hdmi is used and change video arguments accordingly +- disable blanking and cursor blinking + +--- + board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++ + include/configs/mx6sabre_common.h | 21 +++++++++++++++++++++ + 2 files changed, 44 insertions(+) + +diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c +index 12d8c56..303b774 100644 +--- a/board/freescale/mx6sabresd/mx6sabresd.c ++++ b/board/freescale/mx6sabresd/mx6sabresd.c +@@ -12,6 +12,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -24,6 +25,7 @@ + #include + #include + #include ++#include + DECLARE_GLOBAL_DATA_PTR; + + #define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ +@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR; + #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) + ++#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \ ++ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ ++ PAD_CTL_ODE | PAD_CTL_SRE_FAST) ++ ++#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL) ++ + int dram_init(void) + { + gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); +@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = { + MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL), + }; + ++static struct i2c_pads_info i2c_pad_info1 = { ++ .scl = { ++ .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD, ++ .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD, ++ .gp = IMX_GPIO_NR(4, 12) ++ }, ++ .sda = { ++ .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD, ++ .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD, ++ .gp = IMX_GPIO_NR(4, 13) ++ } ++}; ++ + static void setup_spi(void) + { + imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads)); +@@ -477,6 +498,8 @@ int board_init(void) + setup_spi(); + #endif + ++ setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1); ++ + return 0; + } + +diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h +index 5ee7fa5..b83bf74 100644 +--- a/include/configs/mx6sabre_common.h ++++ b/include/configs/mx6sabre_common.h +@@ -85,6 +85,13 @@ + /* Command definition */ + #include + ++/* I2C Configs */ ++#define CONFIG_CMD_I2C ++#define CONFIG_SYS_I2C ++#define CONFIG_SYS_I2C_MXC ++#define CONFIG_SYS_I2C_SPEED 100000 ++#define CONFIG_I2C_EDID ++ + #define CONFIG_CMD_BMODE + #define CONFIG_CMD_BOOTZ + #define CONFIG_CMD_SETEXPR +@@ -117,6 +124,15 @@ + #define EMMC_ENV "" + #endif + ++#define VIDEOARGS \ ++ "videoargs=" \ ++ "i2c dev 1 ; " \ ++ "if i2c probe 0x50 ; then " \ ++ "setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \ ++ "else " \ ++ "setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \ ++ "fi\0" ++ + #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ + "uimage=uImage\0" \ +@@ -144,7 +160,11 @@ + "fi; " \ + "fi\0" \ + EMMC_ENV \ ++ VIDEOARGS \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ ++ "video=${video} "\ ++ "consoleblank=0 " \ ++ "vt.global_cursor_default=0 " \ + "root=${mmcroot}\0" \ + "loadbootscript=" \ + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ +@@ -153,6 +173,7 @@ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "mmcboot=echo Booting from mmc ...; " \ ++ "run videoargs; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ +-- +1.8.3.2 + diff --git a/recipes/u-boot/u-boot-fslc_2014.01.bbappend b/recipes/u-boot/u-boot-fslc_2014.01.bbappend new file mode 100644 index 0000000..b4ff56f --- /dev/null +++ b/recipes/u-boot/u-boot-fslc_2014.01.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$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +SRC_URI += " \ + file://0001-Updated-kernel-arguments-for-sabre-sd.patch \ + " -- cgit v1.2.3-54-g00ecf From 52b5016e0c35bd1e6459eb31f5502c6817c04367 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 May 2014 10:21:09 +0300 Subject: mesa: include gles development files in sdk The sdk still needs to have gles development files, since the qtqlesstream is not there yet. Change-Id: I5a078171b28542ead2e96a9942b781a93f4b697e Reviewed-by: Andy Nichols --- conf/distro/include/emulator.conf | 2 ++ recipes/mesa/mesa_9.2.5.bbappend | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 recipes/mesa/mesa_9.2.5.bbappend diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 9b22383..3d85b6a 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -36,4 +36,6 @@ MACHINE_EXTRA_INSTALL = "\ " MACHINE_EXTRA_INSTALL_SDK = "\ + libegl-mesa-dev \ + libgles2-mesa-dev \ " diff --git a/recipes/mesa/mesa_9.2.5.bbappend b/recipes/mesa/mesa_9.2.5.bbappend new file mode 100644 index 0000000..627f70b --- /dev/null +++ b/recipes/mesa/mesa_9.2.5.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$ +## +############################################################################# + +EGL_PLATFORMS = "fbdev" +DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" +DRIDRIVERS_append += "swrast" +EXTRA_OECONF += "--with-dri-drivers=""" -- cgit v1.2.3-54-g00ecf From 506533ebc0e592b34d68bb1fa944866edf3e389d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 16 May 2014 10:20:54 +0300 Subject: emulator: include mesa back to the image Qt gets dependency to libEGL.so which need to be in the image as well. Change-Id: I414198d06e42432cb03a58d70ce622a1eb8890a1 Reviewed-by: Laszlo Agocs Reviewed-by: Andy Nichols --- conf/distro/include/emulator.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 3d85b6a..dee1df3 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -32,6 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" MACHINE_EXTRA_INSTALL = "\ + libegl-mesa \ + libgles2-mesa \ mount-vboxsf \ " -- cgit v1.2.3-54-g00ecf From 2548e68fdc74edc7b5da703565bc777da7f2cd8d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 19 May 2014 17:59:31 +0300 Subject: openssl: make sure c_rehash is included in the image And make /usr/lib/ssl/certs symbolic link to /etc/ssl/certs, so that ca-certificates are used. Task-number: QTEE-502 Change-Id: Id673b5db066b184465425b56df9c1fa41e68fa70 Reviewed-by: Kalle Viironen --- recipes/openssl/openssl_1.0.1g.bbappend | 28 ++++++++++++++++++++++ .../packagegroup-b2qt-embedded-base.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 recipes/openssl/openssl_1.0.1g.bbappend diff --git a/recipes/openssl/openssl_1.0.1g.bbappend b/recipes/openssl/openssl_1.0.1g.bbappend new file mode 100644 index 0000000..1ba0a2e --- /dev/null +++ b/recipes/openssl/openssl_1.0.1g.bbappend @@ -0,0 +1,28 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +PACKAGECONFIG += "perl" + +do_install_append () { + rmdir ${D}${libdir}/ssl/certs + ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/ +} diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb index e7f15bb..bcc7868 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb @@ -32,6 +32,7 @@ RDEPENDS_${PN} = "\ psplash \ openssh-sftp-server \ openssl \ + openssl-misc \ libpng \ jpeg \ tiff \ -- cgit v1.2.3-54-g00ecf From 39c91776f85b24b9f4a9e30df3160d53454bb658 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 20 May 2014 08:44:07 +0300 Subject: ca-certificates: enable c_rehash in update-ca-certificates c_rehash was not called from update-ca-certificates and hashes were not generated. Disabling the patch so that it's now again called. Task-number: QTEE-502 Change-Id: I4640427d34f3875b3ddb953bb40a31f6a7d255ff Reviewed-by: Kalle Viironen --- .../ca-certificates_20130610.bbappend | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipes/ca-certificates/ca-certificates_20130610.bbappend diff --git a/recipes/ca-certificates/ca-certificates_20130610.bbappend b/recipes/ca-certificates/ca-certificates_20130610.bbappend new file mode 100644 index 0000000..0964c85 --- /dev/null +++ b/recipes/ca-certificates/ca-certificates_20130610.bbappend @@ -0,0 +1,23 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch" -- cgit v1.2.3-54-g00ecf From 2ab3d7fc456ece32ab23e1909ea0d865955f29d9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 21 May 2014 14:41:16 +0300 Subject: blacklist evbug kernel module This was causing lot's of kernel messages from input devices. Task-number: QTEE-565 Change-Id: I9460e2eb972b0201bb2caa5cce064b05619af561 Reviewed-by: Kalle Viironen Reviewed-by: Laszlo Agocs --- recipes/base-files/base-files/blacklist.conf | 1 + recipes/base-files/base-files_3.0.14.bbappend | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 recipes/base-files/base-files/blacklist.conf diff --git a/recipes/base-files/base-files/blacklist.conf b/recipes/base-files/base-files/blacklist.conf new file mode 100644 index 0000000..a8b8885 --- /dev/null +++ b/recipes/base-files/base-files/blacklist.conf @@ -0,0 +1 @@ +blacklist evbug diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend index 4b8908a..6e083e2 100644 --- a/recipes/base-files/base-files_3.0.14.bbappend +++ b/recipes/base-files/base-files_3.0.14.bbappend @@ -20,7 +20,15 @@ ## ############################################################################# +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SRC_URI += "\ + file://blacklist.conf \ + " + do_install_append() { - ln -s /home/root ${D}/root - echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname + ln -s /home/root ${D}/root + echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname + + install -m 0755 -d ${D}${sysconfdir}/modprobe.d + install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d } -- cgit v1.2.3-54-g00ecf 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 From 5f9ec5ab705494e41e1d2a344ae79e13691c0582 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 14 Aug 2014 15:31:11 +0300 Subject: Fix c_rehash problem on ca-certificates c_rehash has dependency to 'env' found from coreutils-native, add it to the dependency chain. Task-number: QTEE-736 Change-Id: I926bcebc6277238cfef081d95702af7487390bcf Reviewed-by: Rainer Keller --- recipes/ca-certificates/ca-certificates_20130610.bbappend | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/ca-certificates/ca-certificates_20130610.bbappend b/recipes/ca-certificates/ca-certificates_20130610.bbappend index 0964c85..723a900 100644 --- a/recipes/ca-certificates/ca-certificates_20130610.bbappend +++ b/recipes/ca-certificates/ca-certificates_20130610.bbappend @@ -21,3 +21,4 @@ ############################################################################# SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch" +DEPENDS_class-native = "coreutils-native" -- cgit v1.2.3-54-g00ecf From 79005827c3eba2f8f60f7d3b59dbdcfcb0bcbfe0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 13 Aug 2014 11:44:38 +0300 Subject: New sha1 for meta-fsl-arm-extra Previous sha1 caused failure in u-boot-script-boundary. Task-number: QTEE-737 Change-Id: Ib066c3e86a02f0113c01bd499a7eee2bd1eb794d Reviewed-by: Rainer Keller Reviewed-by: Kalle Viironen --- b2qt-init-build-env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2qt-init-build-env b/b2qt-init-build-env index bc747b8..91b41f0 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -56,7 +56,7 @@ checkout git://git.yoctoproject.org/poky "daisy:b0ce70ffa820c8b40 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://github.com/Freescale/meta-fsl-arm-extra "daisy:6c3871ea5b0ec358e978814b5b38cef40d8dcbbc" checkout git://git.yoctoproject.org/meta-raspberrypi "daisy:cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55" checkout git://git.toradex.com/meta-toradex "V2.2:371ea626f29a2a12294ab6ea30e36743a9e2f78f" -- cgit v1.2.3-54-g00ecf From 7cb9031e6cbb17e9658c633888d407694d59abe8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 21 Aug 2014 12:26:28 +0300 Subject: Include u-boot-fw-tools to image Needed for the remote flashing. Change-Id: I16cda8b717c87807d71696a60f8a9ce1d4c4e077 Reviewed-by: Rainer Keller --- 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 7b528f0..3320efe 100644 --- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb +++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb @@ -31,4 +31,5 @@ RDEPENDS_${PN} = "\ binutils \ binutils-symlinks \ i2c-tools \ + u-boot-fw-utils \ " -- cgit v1.2.3-54-g00ecf From a1af90f3e900e5fd93fdedf74bafd2269f92ec45 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 21 Aug 2014 12:27:02 +0300 Subject: Update sha1 for meta-fsl-arm-extra Upstream changes broke the previous version for u-boot-imx git checkout. Change-Id: Idb6b81e1ef4bbe50b5bdd98e2f28e40dffa6d911 Reviewed-by: Kalle Viironen --- b2qt-init-build-env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 91b41f0..e1f34fc 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -53,12 +53,12 @@ checkout() { } 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:6c3871ea5b0ec358e978814b5b38cef40d8dcbbc" +checkout git://git.yoctoproject.org/meta-ti "daisy:5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66" checkout git://git.yoctoproject.org/meta-raspberrypi "daisy:cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55" checkout git://git.toradex.com/meta-toradex "V2.2:371ea626f29a2a12294ab6ea30e36743a9e2f78f" +checkout git://git.openembedded.org/meta-openembedded "daisy:a6dcf6265822ca1484d991d10a3042e04a960cdb" if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt -- cgit v1.2.3-54-g00ecf