From da8d6937e0ac0115c1de168296b9b9b8f455cd2f Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Tue, 31 Oct 2017 17:52:15 -0200 Subject: linux-fslc: Update to 4.14-based fork This upgrades the Linux kernel to the 4.14-rc7 release and apply the following commits on top of it: - bd340b0f7370 Merge remote-tracking branch 'arm/imx/soc' into 4.14.x+fslc - 2b31720933b3 Merge remote-tracking branch 'arm/imx/dt64' into 4.14.x+fslc - 350ccd8d477a Merge remote-tracking branch 'arm/imx/dt' into 4.14.x+fslc - d91c795abd16 Merge remote-tracking branch 'arm/imx/defconfig' into 4.14.x+fslc - 5f479447d983 Merge tag 'pm-urgent-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm - b39ab98e2f47 Mark 'ioremap_page_range()' as possibly sleeping - daea3daaf9d5 Merge tag 'mmc-v4.14-rc4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc - 1960e8eabcba Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 - 2a9a86d5c813 PM / QoS: Fix default runtime_pm device resume latency Signed-off-by: Fabio Berton Signed-off-by: Otavio Salvador --- recipes-kernel/linux/linux-fslc_4.13.bb | 17 ----------------- recipes-kernel/linux/linux-fslc_4.14.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 recipes-kernel/linux/linux-fslc_4.13.bb create mode 100644 recipes-kernel/linux/linux-fslc_4.14.bb (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-fslc_4.13.bb b/recipes-kernel/linux/linux-fslc_4.13.bb deleted file mode 100644 index f3405c636..000000000 --- a/recipes-kernel/linux/linux-fslc_4.13.bb +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2012-2017 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.13+git${SRCPV}" - -SRCBRANCH = "4.13.x+fslc" -SRCREV = "e12ac43313df6e4695a2640332725712ef22f192" - -COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" diff --git a/recipes-kernel/linux/linux-fslc_4.14.bb b/recipes-kernel/linux/linux-fslc_4.14.bb new file mode 100644 index 000000000..6adc12e1c --- /dev/null +++ b/recipes-kernel/linux/linux-fslc_4.14.bb @@ -0,0 +1,17 @@ +# Copyright (C) 2012-2017 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.14+git${SRCPV}" + +SRCBRANCH = "4.14.x+fslc" +SRCREV = "bd340b0f7370015791413ea458c0f56715f17e19" + +COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)" -- cgit v1.2.3-54-g00ecf