From 2388fea63d0e4170c3e4f71f864f7705a78049e8 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 29 Dec 2015 15:38:36 +0200 Subject: imx6: update to latest revision of meta-fsl-arm/-extra This updates kernel version for boundary devices, but fixes video playback problems. Change-Id: If76b9c6ee4346d2d818ae933385d07fcc88ff5c3 Reviewed-by: Teemu Holappa --- .../recipes/linux/linux-boundary_3.10.%.bbappend | 50 ---------------------- .../recipes/linux/linux-boundary_3.14.%.bbappend | 24 +++++++++++ scripts/manifest.xml | 4 +- 3 files changed, 26 insertions(+), 52 deletions(-) delete mode 100644 meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend create mode 100644 meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend deleted file mode 100644 index c25739b..0000000 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend +++ /dev/null @@ -1,50 +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://www.qt.io/contact-us. -## -## -## $QT_END_LICENSE$ -## -############################################################################# - -FILESEXTRAPATHS_prepend := "${THISDIR}/../../../recipes/linux/linux:" -SRC_URI += "\ - file://ARM-perf-add-support-for-perf-registers-API.diff \ - file://ARM-perf-wire-up-perf_regs-and-unwind-support-for-AR.patch \ - " - -# kernel image files are not needed in the image -RDEPENDS_kernel-base = "" - -do_configure_prepend() { - # fix imx-vpu break on video decoding - echo "CONFIG_VMSPLIT_2G=y" >> ${WORKDIR}/defconfig - - # include H4 UART for Broadcom BT on Nitrogen6_Lite - echo "CONFIG_BT_HCIUART_H4=y" >> ${WORKDIR}/defconfig - - # include Broadcom WiFi for Nitrogen6_Lite - echo "CONFIG_BRCMFMAC=m" >> ${WORKDIR}/defconfig - - # include LEDS_GPIO for Nitrogen6_Lite - echo "CONFIG_LEDS_GPIO=y" >> ${WORKDIR}/defconfig - - # enable uvcvideo module - echo "CONFIG_MEDIA_USB_SUPPORT=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_VIDEO_CLASS=m" >> ${WORKDIR}/defconfig - - echo "CONFIG_USB_ACM=m" >> ${WORKDIR}/defconfig -} diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend new file mode 100644 index 0000000..8059c93 --- /dev/null +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.14.%.bbappend @@ -0,0 +1,24 @@ +############################################################################# +## +## 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://www.qt.io/contact-us. +## +## +## $QT_END_LICENSE$ +## +############################################################################# + +# kernel image files are not needed in the image +RDEPENDS_kernel-base = "" diff --git a/scripts/manifest.xml b/scripts/manifest.xml index e7b1c52..6776388 100644 --- a/scripts/manifest.xml +++ b/scripts/manifest.xml @@ -29,7 +29,7 @@