[meta-freescale] [3rdparty][krogoth/morty/master][PATCH] linux-toradex: update stable 4.1 kernel

[Stefan Agner]

From: Stefan Agner <stefan.agner at toradex.com>

Update the Linux 4.1 Toradex branch to the latest version, containing
Toradex specific fixes as well as the latest version from the kernel.org
stable branches. This also updates defconfig, with notably also compiling
extcon support now which makes the USB OTG port work again.

Signed-off-by: Stefan Agner <stefan.agner at toradex.com>
---
 recipes-kernel/linux/linux-toradex-4.1/defconfig | 35 ++++++++++++++++++++----
 recipes-kernel/linux/linux-toradex_4.1.bb        |  4 +--
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/recipes-kernel/linux/linux-toradex-4.1/defconfig b/recipes-kernel/linux/linux-toradex-4.1/defconfig
index a06fb87..46e0bf0 100644
--- a/recipes-kernel/linux/linux-toradex-4.1/defconfig
+++ b/recipes-kernel/linux/linux-toradex-4.1/defconfig
@@ -8,6 +8,8 @@ CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
 CONFIG_CGROUPS=y
 CONFIG_NAMESPACES=y
@@ -49,11 +51,13 @@ CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_PNP=y
 CONFIG_IP_PNP_DHCP=y
+CONFIG_NET_IPGRE_DEMUX=m
 # CONFIG_INET_XFRM_MODE_TRANSPORT is not set
 # CONFIG_INET_XFRM_MODE_TUNNEL is not set
 # CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
+CONFIG_IPV6_SIT=m
 CONFIG_NETFILTER=y
 CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NF_CONNTRACK=y
@@ -72,6 +76,7 @@ CONFIG_IP_NF_NAT=y
 CONFIG_IP_NF_TARGET_MASQUERADE=y
 CONFIG_IP6_NF_IPTABLES=y
 CONFIG_NF_TABLES_BRIDGE=y
+CONFIG_L2TP=m
 CONFIG_BRIDGE=y
 # CONFIG_BRIDGE_IGMP_SNOOPING is not set
 CONFIG_BRIDGE_VLAN_FILTERING=y
@@ -124,6 +129,12 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 CONFIG_MICREL_PHY=y
+CONFIG_PPP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_MPPE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
 CONFIG_USB_NET_DRIVERS=m
 CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_NCM is not set
@@ -134,7 +145,8 @@ CONFIG_USB_ZD1201=m
 CONFIG_RT2X00=m
 CONFIG_RT2800USB=m
 # CONFIG_RT2800USB_RT35XX is not set
-# CONFIG_RTL_CARDS is not set
+CONFIG_RTL8192CU=m
+# CONFIG_RTLWIFI_DEBUG is not set
 CONFIG_INPUT_POLLDEV=y
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
@@ -201,11 +213,15 @@ CONFIG_SND=y
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_USB is not set
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_FSL_SAI=y
-CONFIG_SND_SOC_FSL_SAI_WM9712=y
 CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_FSL_SAI_WM9712=y
+CONFIG_HIDRAW=y
+CONFIG_HID_MULTITOUCH=m
+CONFIG_USB_HIDDEV=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_ACM=m
+CONFIG_USB_WDM=m
 CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
@@ -215,14 +231,22 @@ CONFIG_USB_SERIAL_CONSOLE=y
 CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_FTDI_SIO=y
 CONFIG_USB_SERIAL_PL2303=y
+CONFIG_USB_SERIAL_OPTION=m
 CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_FSL_USB2=y
-CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
 CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
 CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_HID=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
@@ -244,8 +268,9 @@ CONFIG_DMADEVICES=y
 # CONFIG_MX3_IPU is not set
 CONFIG_FSL_EDMA=y
 # CONFIG_IOMMU_SUPPORT is not set
+CONFIG_EXTCON=y
+CONFIG_EXTCON_USB_GPIO=y
 CONFIG_IIO=y
-CONFIG_IIO_TRIGGER=y
 CONFIG_VF610_ADC=y
 CONFIG_PWM=y
 CONFIG_PWM_FSL_FTM=y
diff --git a/recipes-kernel/linux/linux-toradex_4.1.bb b/recipes-kernel/linux/linux-toradex_4.1.bb
index 1ac0b16..770e354 100644
--- a/recipes-kernel/linux/linux-toradex_4.1.bb
+++ b/recipes-kernel/linux/linux-toradex_4.1.bb
@@ -6,8 +6,8 @@ SUMMARY = "Linux kernel for Toradex Colibri VFxx Computer on Modules"
 SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH} \
            file://defconfig"
 
-LOCALVERSION = "-v2.5b3"
+LOCALVERSION = "-v2.5.1"
 SRCBRANCH = "toradex_vf_4.1"
-SRCREV = "e6d111cd909551cec5902358db1e25dcaa8c86bb"
+SRCREV = "39ac0033f2345ce7b5d8ca4439192407dacb2355"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(vf)"
-- 
2.7.4