From 02c392a92ea6fd0f4961337aaf3719c4c8ec7dab Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Wed, 21 Oct 2015 02:26:57 +0200
Subject: colibri_vf: update/load USB Gadget ConfigFS automatically

Update defconfig and kernel version to latest version from git. This
also configures the USB Gadget ConfigFS as a module. Add the ConfigFS
module to the list of autoloaded modules.
---
 recipes-kernel/linux/linux-toradex-4.1/defconfig | 13 ++++++++++++-
 recipes-kernel/linux/linux-toradex_4.1.bb        |  9 ++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

(limited to 'recipes-kernel/linux')

diff --git a/recipes-kernel/linux/linux-toradex-4.1/defconfig b/recipes-kernel/linux/linux-toradex-4.1/defconfig
index a06fb87..302a24a 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
@@ -219,10 +221,17 @@ 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,6 +253,8 @@ 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
diff --git a/recipes-kernel/linux/linux-toradex_4.1.bb b/recipes-kernel/linux/linux-toradex_4.1.bb
index 0a65331..1286074 100644
--- a/recipes-kernel/linux/linux-toradex_4.1.bb
+++ b/recipes-kernel/linux/linux-toradex_4.1.bb
@@ -6,8 +6,11 @@ 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.5b1"
-SRCBRANCH = "toradex_vf_4.1"
-SRCREV = "4d054fbf42d98a54bdb330eebfe419af8a825118"
+# Load USB functions configurable through configfs (CONFIG_USB_CONFIGFS)
+KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
+
+LOCALVERSION = "-v2.5b2"
+SRCBRANCH = "toradex_vf_4.1-next"
+SRCREV = "db6b1f8270757539d90422ee5294bc25ff13a040"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(vf)"
-- 
cgit v1.2.3