From 1dd18d6e0acf5b30494c250c20f6b1cc7b0bd529 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Mon, 10 Oct 2016 16:29:11 -0300 Subject: linux-fslc: Update to 4.8-based fork This upgrades the Linux kernel to the upcoming 4.8.1 release. Signed-off-by: Fabio Berton Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-fslc/defconfig | 4 +++- recipes-kernel/linux/linux-fslc_4.6.bb | 17 ----------------- recipes-kernel/linux/linux-fslc_4.8.bb | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc_4.6.bb create mode 100644 recipes-kernel/linux/linux-fslc_4.8.bb diff --git a/recipes-kernel/linux/linux-fslc/defconfig b/recipes-kernel/linux/linux-fslc/defconfig index 21339ce29..3219480b9 100644 --- a/recipes-kernel/linux/linux-fslc/defconfig +++ b/recipes-kernel/linux/linux-fslc/defconfig @@ -146,7 +146,7 @@ CONFIG_MICREL_PHY=y CONFIG_USB_PEGASUS=m CONFIG_USB_RTL8150=m CONFIG_USB_RTL8152=m -CONFIG_USB_USBNET=m +CONFIG_USB_USBNET=y CONFIG_USB_NET_CDC_EEM=m CONFIG_BRCMFMAC=m CONFIG_WL12XX=m @@ -161,6 +161,7 @@ CONFIG_KEYBOARD_IMX=y CONFIG_MOUSE_PS2=m CONFIG_MOUSE_PS2_ELANTECH=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_TOUCHSCREEN_EGALAX=y CONFIG_TOUCHSCREEN_IMX6UL_TSC=y CONFIG_TOUCHSCREEN_EDT_FT5X06=y @@ -296,6 +297,7 @@ CONFIG_USB_ZERO=m CONFIG_USB_ETH=m CONFIG_USB_G_NCM=m CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m CONFIG_USB_MASS_STORAGE=m CONFIG_USB_G_SERIAL=m CONFIG_MMC=y diff --git a/recipes-kernel/linux/linux-fslc_4.6.bb b/recipes-kernel/linux/linux-fslc_4.6.bb deleted file mode 100644 index e59d0eb04..000000000 --- a/recipes-kernel/linux/linux-fslc_4.6.bb +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2012-2016 O.S. Systems Software LTDA. -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" -DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ -provide support for some backported features and fixes, or because it was applied in linux-next \ -and takes some time to become part of a stable version, or because it is not applicable for \ -upstreaming." - -include linux-fslc.inc - -PV = "4.6+git${SRCPV}" - -SRCBRANCH = "4.6.x" -SRCREV = "9be3cdc189ab931653b5d6c515627e75a9654119" - -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)" diff --git a/recipes-kernel/linux/linux-fslc_4.8.bb b/recipes-kernel/linux/linux-fslc_4.8.bb new file mode 100644 index 000000000..4605394b3 --- /dev/null +++ b/recipes-kernel/linux/linux-fslc_4.8.bb @@ -0,0 +1,17 @@ +# Copyright (C) 2012-2016 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "FSL Community BSP Linux mainline based kernel with backported features and fixes" +DESCRIPTION = "Linux kernel based on mainline kernel used by FSL Community BSP in order to \ +provide support for some backported features and fixes, or because it was applied in linux-next \ +and takes some time to become part of a stable version, or because it is not applicable for \ +upstreaming." + +include linux-fslc.inc + ++PV = "4.8+git${SRCPV}" + +SRCBRANCH = "4.8.x+fslc" +SRCREV = "a7fac751ddba9e30101093fef61f2682cce039de" + +COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf)" -- cgit v1.2.3-54-g00ecf