summaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authoralexandra-ioana.safta@nxp.com <alexandra-ioana.safta@nxp.com>2017-06-02 19:03:41 +0300
committerOtavio Salvador <otavio@ossystems.com.br>2017-06-17 10:17:32 -0300
commit07f9300b231295d1309d1e3935698ecff5f60332 (patch)
tree632f5fdd45fe1fdd3935d4df2c277a8508584c42 /recipes-kernel
parenta98c77c3145b8be8fc6a6c92533054d6d853d0ee (diff)
downloadmeta-freescale-07f9300b231295d1309d1e3935698ecff5f60332.tar.gz
linux-imx: Upgrade to 4.1.15-2.1.0 release supporting i.MX 6SLL EVK
Add support for i.MX 6SLL EVK and supporting device trees The 4.1.15-2.10 updates are provided in the 4.1.15-2.0.0 release branch Signed-off-by: Alexandra Safta <alexandra-ioana.safta@nxp.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig5
-rw-r--r--recipes-kernel/linux/linux-imx_4.1.15.bb5
2 files changed, 6 insertions, 4 deletions
diff --git a/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig b/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig
index 2f075351..ab4fdd2e 100644
--- a/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig
+++ b/recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig
@@ -26,6 +26,7 @@ CONFIG_SOC_IMX6SL=y
26CONFIG_SOC_IMX6SX=y 26CONFIG_SOC_IMX6SX=y
27CONFIG_SOC_IMX6ULL=y 27CONFIG_SOC_IMX6ULL=y
28CONFIG_SOC_IMX7D=y 28CONFIG_SOC_IMX7D=y
29CONFIG_SOC_IMX6SLL=y
29CONFIG_SOC_VF610=y 30CONFIG_SOC_VF610=y
30# CONFIG_SWP_EMULATE is not set 31# CONFIG_SWP_EMULATE is not set
31CONFIG_SMP=y 32CONFIG_SMP=y
@@ -142,7 +143,7 @@ CONFIG_MICREL_PHY=y
142CONFIG_USB_PEGASUS=m 143CONFIG_USB_PEGASUS=m
143CONFIG_USB_RTL8150=m 144CONFIG_USB_RTL8150=m
144CONFIG_USB_RTL8152=m 145CONFIG_USB_RTL8152=m
145CONFIG_USB_USBNET=m 146CONFIG_USB_USBNET=y
146CONFIG_USB_NET_CDC_EEM=m 147CONFIG_USB_NET_CDC_EEM=m
147CONFIG_BCMDHD=y 148CONFIG_BCMDHD=y
148CONFIG_BCMDHD_SDIO=y 149CONFIG_BCMDHD_SDIO=y
@@ -401,7 +402,7 @@ CONFIG_DEBUG_FS=y
401CONFIG_MAGIC_SYSRQ=y 402CONFIG_MAGIC_SYSRQ=y
402# CONFIG_SCHED_DEBUG is not set 403# CONFIG_SCHED_DEBUG is not set
403# CONFIG_DEBUG_BUGVERBOSE is not set 404# CONFIG_DEBUG_BUGVERBOSE is not set
404CONFIG_FUNCTION_TRACER=y 405# CONFIG_FTRACE is not set
405CONFIG_SECURITYFS=y 406CONFIG_SECURITYFS=y
406CONFIG_CRYPTO_USER=y 407CONFIG_CRYPTO_USER=y
407CONFIG_CRYPTO_TEST=m 408CONFIG_CRYPTO_TEST=m
diff --git a/recipes-kernel/linux/linux-imx_4.1.15.bb b/recipes-kernel/linux/linux-imx_4.1.15.bb
index 8bd4f1f1..1d702e6a 100644
--- a/recipes-kernel/linux/linux-imx_4.1.15.bb
+++ b/recipes-kernel/linux/linux-imx_4.1.15.bb
@@ -1,4 +1,5 @@
1# Copyright (C) 2013-2016 Freescale Semiconductor 1# Copyright (C) 2013-2016 Freescale Semiconductor
2# Copyright 2017 NXP
2# Released under the MIT license (see COPYING.MIT for the terms) 3# Released under the MIT license (see COPYING.MIT for the terms)
3 4
4SUMMARY = "Linux Kernel provided and supported by Freescale" 5SUMMARY = "Linux Kernel provided and supported by Freescale"
@@ -11,8 +12,8 @@ require recipes-kernel/linux/linux-dtb.inc
11DEPENDS += "lzop-native bc-native" 12DEPENDS += "lzop-native bc-native"
12 13
13SRCBRANCH = "imx_4.1.15_2.0.0_ga" 14SRCBRANCH = "imx_4.1.15_2.0.0_ga"
14LOCALVERSION = "-2.0.0" 15LOCALVERSION = "-2.1.0"
15SRCREV = "b63f3f52cb393e3287352cf63f0caef31a33ab63" 16SRCREV = "30278abfe0977b1d2f065271ce1ea23c0e2d1b6e"
16 17
17DEFAULT_PREFERENCE = "1" 18DEFAULT_PREFERENCE = "1"
18 19