diff options
Diffstat (limited to 'recipes-kernel')
| -rw-r--r-- | recipes-kernel/linux/linux-imx-4.1.15/imx/defconfig | 5 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-imx_4.1.15.bb | 5 |
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 CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6ULL=y CONFIG_SOC_IMX7D=y +CONFIG_SOC_IMX6SLL=y CONFIG_SOC_VF610=y # CONFIG_SWP_EMULATE is not set CONFIG_SMP=y @@ -142,7 +143,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_BCMDHD=y CONFIG_BCMDHD_SDIO=y @@ -401,7 +402,7 @@ CONFIG_DEBUG_FS=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_BUGVERBOSE is not set -CONFIG_FUNCTION_TRACER=y +# CONFIG_FTRACE is not set CONFIG_SECURITYFS=y CONFIG_CRYPTO_USER=y CONFIG_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 @@ # Copyright (C) 2013-2016 Freescale Semiconductor +# Copyright 2017 NXP # Released under the MIT license (see COPYING.MIT for the terms) SUMMARY = "Linux Kernel provided and supported by Freescale" @@ -11,8 +12,8 @@ require recipes-kernel/linux/linux-dtb.inc DEPENDS += "lzop-native bc-native" SRCBRANCH = "imx_4.1.15_2.0.0_ga" -LOCALVERSION = "-2.0.0" -SRCREV = "b63f3f52cb393e3287352cf63f0caef31a33ab63" +LOCALVERSION = "-2.1.0" +SRCREV = "30278abfe0977b1d2f065271ce1ea23c0e2d1b6e" DEFAULT_PREFERENCE = "1" |