From cc365e9afa19612c2c67831140119dcbf51681d7 Mon Sep 17 00:00:00 2001
From: John Weber <rjohnweber@gmail.com>
Date: Thu, 24 Apr 2014 21:46:40 -0500
Subject: [PATCH] linux-wandboard (3.10.17): Move to GA kernel (srcrev 9d567e)

Update Wandboard Linux kernel to one based on FSL's 3.10.17_1.0.0_ga. Also,
updated the defconfig to better align with FSL's imx_v7_defconfig where
possible to avoid potential problems

Signed-off-by: John Weber <rjohnweber@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../linux/linux-wandboard-3.10.17/defconfig   | 22 ++++++++++++++++++-
 .../linux/linux-wandboard_3.10.17.bb          |  6 ++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/recipes-kernel/linux/linux-wandboard-3.10.17/defconfig b/recipes-kernel/linux/linux-wandboard-3.10.17/defconfig
index b7e7b45..2b2dfc0 100644
--- a/recipes-kernel/linux/linux-wandboard-3.10.17/defconfig
+++ b/recipes-kernel/linux/linux-wandboard-3.10.17/defconfig
@@ -31,7 +31,7 @@ CONFIG_WAND_RFKILL=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -250,6 +250,7 @@ CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_UDC=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_ZERO=m
@@ -322,12 +323,31 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_FTRACE is not set
 CONFIG_SECURITYFS=y
 CONFIG_CRYPTO_USER=y
+CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_CCM=y
 CONFIG_CRYPTO_GCM=y
 CONFIG_CRYPTO_CBC=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
 CONFIG_CRYPTO_LRW=y
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=y
+CONFIG_CRYPTO_RMD128=y
+CONFIG_CRYPTO_RMD160=y
+CONFIG_CRYPTO_RMD256=y
+CONFIG_CRYPTO_RMD320=y
+CONFIG_CRYPTO_SHA1_ARM=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_TGR192=y
+CONFIG_CRYPTO_WP512=y
+CONFIG_CRYPTO_AES_ARM=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_CAMELLIA=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_TWOFISH=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
diff --git a/recipes-kernel/linux/linux-wandboard_3.10.17.bb b/recipes-kernel/linux/linux-wandboard_3.10.17.bb
index 61f5438..5449374 100644
--- a/recipes-kernel/linux/linux-wandboard_3.10.17.bb
+++ b/recipes-kernel/linux/linux-wandboard_3.10.17.bb
@@ -6,9 +6,9 @@ require recipes-kernel/linux/linux-dtb.inc
 
 DEPENDS += "lzop-native bc-native"
 
-# Wandboard branch - based on 3.10.17_1.0.0_beta from Freescale git
-SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_beta"
-SRCREV = "4a8ad4e16bbc17be82e95ffcd4241e21d441efbd"
+# Wandboard branch - based on 3.10.17_1.0.0_ga from Freescale git
+SRCBRANCH = "wandboard_imx_3.10.17_1.0.0_ga"
+SRCREV = "9d567e4f285e80bc332e79f0636259bc05a4ee3b"
 LOCALVERSION = "-1.0.0-wandboard"