From 8bf9a739a59858ffca8e3b88279dcdb37df3cebf Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 17 Sep 2013 12:04:46 +0200
Subject: [PATCH] meta-digi-arm: update linux-dey revision

To get the latest changes: logo, mac-address, wireless...

Also synchronize the defconfig with the one in the kernel tree.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 .../linux/linux-dey-3.10/ccardimx28js/defconfig | 17 +++++++++--------
 .../recipes-kernel/linux/linux-dey-rev_3.10.inc |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig
index 4da4e9255..a6f89e9e0 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-3.10/ccardimx28js/defconfig
@@ -1,4 +1,3 @@
-CONFIG_LOCALVERSION="mxs"
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
@@ -24,8 +23,11 @@ CONFIG_ARCH_MXS=y
 # CONFIG_ARM_THUMB is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 CONFIG_FPE_NWFPE=y
 # CONFIG_BINFMT_SCRIPT is not set
 CONFIG_NET=y
@@ -41,6 +43,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
+CONFIG_NET_SCHED=y
 CONFIG_CAN=y
 # CONFIG_CAN_GW is not set
 CONFIG_CAN_FLEXCAN=y
@@ -50,8 +53,8 @@ CONFIG_BT_HCIBTUSB=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_ATH3K=y
-CONFIG_CFG80211=y
-CONFIG_CFG80211_WEXT=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_RFKILL=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
@@ -92,9 +95,7 @@ CONFIG_REALTEK_PHY=y
 CONFIG_MICREL_PHY=y
 CONFIG_USB_USBNET=y
 CONFIG_USB_NET_SMSC95XX=y
-CONFIG_ATH_CARDS=y
-CONFIG_ATH6KL=m
-CONFIG_ATH6KL_SDIO=m
+# CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
index 4434b4016..59f280a8c 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-rev_3.10.inc
@@ -1,7 +1,7 @@
 # Copyright (C) 2012 Digi International
 
 SRCREV_external = ""
-SRCREV_internal = "3b9f8c6ad5d91c5d6ae87567cf7386faf28ee3e4"
+SRCREV_internal = "551c6566c5ae43ef4091f4ce139e23b24c93309e"
 SRCREV = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${SRCREV_internal}', '${SRCREV_external}', d)}"
 
 SRC_URI_external = "${DIGI_GITHUB_GIT}/yocto-linux.git;protocol=git"