From 4cd8276d045d3db344d635c530a9a92233575f06 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Tue, 3 Feb 2015 15:54:52 +0100
Subject: colibri-vf: update Linux kernel and U-Boot git hashes

Also update default defconfig for colibri-vf.
---
 recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb |  2 +-
 recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb          |  2 +-
 recipes-kernel/linux/linux-toradex-vf-3.18/defconfig  | 17 ++++++++++-------
 recipes-kernel/linux/linux-toradex-vf_3.18.bb         |  4 ++--
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
index 848cce7..fb9e40a 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl-fw-utils_git.bb
@@ -13,7 +13,7 @@ DEFAULT_PREFERENCE_colibri-imx6 = "1"
 
 FILESPATHPKG =. "git:"
 S="${WORKDIR}/git"
-SRCREV_colibri-vf = "f7e57f71da1eecbf1ac28339868d15492c929925"
+SRCREV_colibri-vf = "73b99ed96be527c482e63f8d0aac4e6188b1f7e0"
 SRCREV_mx6 = "0260e62f008aa292d87da7c1a9fbe1051a793518"
 SRCBRANCH_colibri-vf = "2014.10-toradex"
 SRCBRANCH_mx6 = "2014.04-toradex"
diff --git a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
index f70c544..74dc6ec 100644
--- a/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
+++ b/recipes-bsp/u-boot/u-boot-toradex-fsl_git.bb
@@ -11,7 +11,7 @@ PR = "r0"
 
 S = "${WORKDIR}/git"
 
-SRCREV_colibri-vf = "f7e57f71da1eecbf1ac28339868d15492c929925"
+SRCREV_colibri-vf = "73b99ed96be527c482e63f8d0aac4e6188b1f7e0"
 SRCBRANCH_colibri-vf = "2014.10-toradex"
 SRCREV_mx6 = "0260e62f008aa292d87da7c1a9fbe1051a793518"
 SRCBRANCH_mx6 = "2014.04-toradex"
diff --git a/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig b/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig
index ecddcfa..e9fc673 100644
--- a/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig
+++ b/recipes-kernel/linux/linux-toradex-vf-3.18/defconfig
@@ -7,6 +7,9 @@ CONFIG_LOG_BUF_SHIFT=18
 CONFIG_CGROUPS=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_RD_GZIP=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
@@ -27,18 +30,13 @@ CONFIG_ARM_ERRATA_775420=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
-CONFIG_HIGHMEM=y
 CONFIG_CMA=y
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_PM_RUNTIME=y
-CONFIG_PM_DEBUG=y
-CONFIG_PM_TEST_SUSPEND=y
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
@@ -109,7 +107,9 @@ CONFIG_KEYBOARD_IMX=y
 # CONFIG_MOUSE_PS2 is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_EGALAX=y
-CONFIG_TOUCHSCREEN_FUSION_F0710A=y
+CONFIG_TOUCHSCREEN_WM97XX=y
+# CONFIG_TOUCHSCREEN_WM9705 is not set
+# CONFIG_TOUCHSCREEN_WM9713 is not set
 CONFIG_TOUCHSCREEN_STMPE=y
 CONFIG_TOUCHSCREEN_COLIBRI_VF50=y
 # CONFIG_LEGACY_PTYS is not set
@@ -122,6 +122,9 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
 CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_IMX=y
+CONFIG_SPI=y
+CONFIG_SPI_FSL_DSPI=y
+CONFIG_SPI_SPIDEV=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_POWER_RESET=y
@@ -159,6 +162,7 @@ CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y
 CONFIG_SND_IMX_SOC=y
+CONFIG_SND_SOC_FSL_SAI_WM9712=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
@@ -191,7 +195,6 @@ CONFIG_RTC_DRV_SNVS=y
 CONFIG_DMADEVICES=y
 # CONFIG_MX3_IPU is not set
 CONFIG_FSL_EDMA=y
-CONFIG_STAGING=y
 # CONFIG_IOMMU_SUPPORT is not set
 CONFIG_IIO=y
 CONFIG_IIO_TRIGGER=y
diff --git a/recipes-kernel/linux/linux-toradex-vf_3.18.bb b/recipes-kernel/linux/linux-toradex-vf_3.18.bb
index 0ec8a3f..a707156 100644
--- a/recipes-kernel/linux/linux-toradex-vf_3.18.bb
+++ b/recipes-kernel/linux/linux-toradex-vf_3.18.bb
@@ -6,8 +6,8 @@ SUMMARY = "Linux kernel for Toradex Colibri VFxx boards"
 SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH} \
            file://defconfig"
 
-LOCALVERSION = "-v2.3b5"
+LOCALVERSION = "-v2.3b7"
 SRCBRANCH = "toradex_vf_3.18"
-SRCREV = "2d3459a0b77892017238715a7ad2471c375cd656"
+SRCREV = "c78b5ae472e69452d5fe44c261d57c8083c59f74"
 DEPENDS += "lzop-native bc-native"
 COMPATIBLE_MACHINE = "(colibri-vf)"
-- 
cgit v1.2.3