From 96ce38cc04b4f8b61751794ce96701631aeb98e4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 7 Aug 2015 13:48:18 +0300 Subject: imx: upstream kernel versions have been updated linux-imx is now new enough, so it doesn't require perf patches. DL version of nitrogen6_max is not supported. Change-Id: Ic5d6fce0f1ed904aed3795d4f82abc5f71b16b30 Reviewed-by: aavit --- .../recipes/linux/linux-boundary_3.10.%.bbappend | 48 ++++++++++++++++++++++ .../recipes/linux/linux-boundary_3.10.17.bbappend | 48 ---------------------- .../recipes/linux/linux-imx_3.10.%.bbappend | 41 ------------------ .../recipes/linux/linux-imx_3.14.%.bbappend | 35 ++++++++++++++++ 4 files changed, 83 insertions(+), 89 deletions(-) create mode 100644 meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend delete mode 100644 meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend delete mode 100644 meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend create mode 100644 meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend (limited to 'meta-fsl-extras') diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend new file mode 100644 index 0000000..1d7f942 --- /dev/null +++ b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.%.bbappend @@ -0,0 +1,48 @@ +############################################################################# +## +## 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 +} diff --git a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend b/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend deleted file mode 100644 index 1d7f942..0000000 --- a/meta-fsl-extras/recipes/linux/linux-boundary_3.10.17.bbappend +++ /dev/null @@ -1,48 +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 -} diff --git a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend deleted file mode 100644 index 6861aff..0000000 --- a/meta-fsl-extras/recipes/linux/linux-imx_3.10.%.bbappend +++ /dev/null @@ -1,41 +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() { - # 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/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend new file mode 100644 index 0000000..e12bde0 --- /dev/null +++ b/meta-fsl-extras/recipes/linux/linux-imx_3.14.%.bbappend @@ -0,0 +1,35 @@ +############################################################################# +## +## 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 = "" + +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