82 files changed, 66220 insertions, 104096 deletions
diff --git a/Config.in b/Config.in
index 8c6211d59..5df03210e 100644
--- a/Config.in
+++ b/Config.in
@@ -118,18 +118,13 @@ config ADK_KERNEL_VERSION_3_13_11
 	depends on !ADK_TARGET_SYSTEM_CUBOX_I
 	boolean
 
-config ADK_KERNEL_VERSION_3_12_18
-	prompt "3.12.18"
+config ADK_KERNEL_VERSION_3_12_20
+	prompt "3.12.20"
 	depends on !ADK_TARGET_SYSTEM_CUBOX_I
 	boolean
 
-config ADK_KERNEL_VERSION_3_11_10
-	prompt "3.11.10"
-	depends on !ADK_TARGET_SYSTEM_CUBOX_I
-	boolean
-
-config ADK_KERNEL_VERSION_3_10_37
-	prompt "3.10.37"
+config ADK_KERNEL_VERSION_3_10_40
+	prompt "3.10.40"
 	depends on !ADK_TARGET_SYSTEM_CUBOX_I
 	boolean
 
@@ -138,8 +133,8 @@ config ADK_KERNEL_VERSION_3_10_30
 	depends on ADK_TARGET_SYSTEM_CUBOX_I
 	boolean
 
-config ADK_KERNEL_VERSION_3_4_87
-	prompt "3.4.87"
+config ADK_KERNEL_VERSION_3_4_90
+	prompt "3.4.90"
 	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 	depends on !ADK_TARGET_SYSTEM_CUBOX_I
 	boolean
@@ -151,11 +146,11 @@ config ADK_KERNEL_VERSION
 	default "3.15-rc4" if ADK_KERNEL_VERSION_3_15_RC4
 	default "3.14.4" if ADK_KERNEL_VERSION_3_14_4
 	default "3.13.11" if ADK_KERNEL_VERSION_3_13_11
-	default "3.12.18" if ADK_KERNEL_VERSION_3_12_18
+	default "3.12.20" if ADK_KERNEL_VERSION_3_12_20
 	default "3.11.10" if ADK_KERNEL_VERSION_3_11_10
-	default "3.10.37" if ADK_KERNEL_VERSION_3_10_37
+	default "3.10.40" if ADK_KERNEL_VERSION_3_10_40
 	default "3.10.30" if ADK_KERNEL_VERSION_3_10_30
-	default "3.4.87" if ADK_KERNEL_VERSION_3_4_87
+	default "3.4.90" if ADK_KERNEL_VERSION_3_4_90
 	help
 
 config ADK_KERNEL_COMP_GZIP_RASPBERRY_PI
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index 86e23f903..d05998491 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -22,23 +22,17 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		d4e06af8b674ac74ba745d52e4382bd3
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_12_18),y)
-KERNEL_VERSION:=	3.12.18
+ifeq ($(ADK_KERNEL_VERSION_3_12_20),y)
+KERNEL_VERSION:=	3.12.20
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		ec32bc59a5feb46c74adb1df7d3e3e98
+KERNEL_MD5SUM:=		09d699cda2394a0bab5f4c52ce666749
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_11_10),y)
-KERNEL_VERSION:=	3.11.10
+ifeq ($(ADK_KERNEL_VERSION_3_10_40),y)
+KERNEL_VERSION:=	3.10.40
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		59f352d3f4e2cdf6755f79e09fa09176
-endif
-ifeq ($(ADK_KERNEL_VERSION_3_10_37),y)
-KERNEL_VERSION:=	3.10.37
-KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
-KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		a08a10ffc31b07d9422af1cd2baa3274
+KERNEL_MD5SUM:=		c1dca08f0f1a60f29b7caa9ff45582a8
 endif
 ifeq ($(ADK_KERNEL_VERSION_3_10_30),y)
 KERNEL_VERSION:=	3.10.30
@@ -46,9 +40,9 @@ KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		f48ca7dd9f2eb14a2903cb6a4fbe07ed
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_87),y)
-KERNEL_VERSION:=	3.4.87
+ifeq ($(ADK_KERNEL_VERSION_3_4_90),y)
+KERNEL_VERSION:=	3.4.90
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
-KERNEL_MD5SUM:=		f926dc8c57400f57aec407106632de0b
+KERNEL_MD5SUM:=		80182c4328337003131501c1fc1bd6a4
 endif
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index d35f1c866..47d6f6c35 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -110,38 +110,6 @@ config ADK_KERNEL_MTD_AR2315
 	default y if ADK_TARGET_SYSTEM_FON_FON2100
 	default n
 
-config ADK_TARGET_NAND
-	boolean
-	select ADK_KERNEL_MISC_FILESYSTEMS
-	select ADK_KERNEL_YAFFS_FS
-	select ADK_KERNEL_YAFFS_YAFFS2
-	select ADK_KERNEL_YAFFS_AUTO_YAFFS2
-	select ADK_KERNEL_MTD
-	select ADK_KERNEL_MTD_PARTITIONS
-	select ADK_KERNEL_MTD_NAND
-	select ADK_KERNEL_MTD_NAND_PLATFORM
-	select ADK_KERNEL_MTD_CHAR
-	select ADK_KERNEL_MTD_BLKDEVS
-	select ADK_KERNEL_MTD_BLOCK
-	default y if ADK_TARGET_WITH_NAND
-	default n
-
-config ADK_TARGET_MTD
-	boolean
-	select ADK_KERNEL_MISC_FILESYSTEMS
-	select ADK_KERNEL_JFFS2_FS
-	select ADK_KERNEL_MTD
-	select ADK_KERNEL_MTD_PARTITIONS
-	select ADK_KERNEL_MTD_CHAR
-	select ADK_KERNEL_MTD_BLKDEVS
-	select ADK_KERNEL_MTD_BLOCK
-	select ADK_KERNEL_MTD_ROOTFS_ROOT_DEV
-	select ADK_KERNEL_MTD_CFI
-	select ADK_KERNEL_MTD_GEN_PROBE
-	select ADK_KERNEL_MTD_PHYSMAP
-	default y if ADK_TARGET_WITH_MTD
-	default n
-
 config ADK_TARGET_MTD_SIZE
 	int
 	default "16777216" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 5efed48fb..353942ba8 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -223,11 +223,17 @@ config ADK_KERNEL_UDF_FS
 	  Please read <file:Documentation/filesystems/udf.txt>.
 
 config ADK_KERNEL_JFFS2_FS
-	tristate
 	prompt "JFFS2 filesystem"
+	tristate
 	select ADK_KERNEL_MISC_FILESYSTEMS
+	select ADK_KERNEL_MTD
+	select ADK_KERNEL_MTD_BLOCK
 	select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS
 	select ADK_KERNEL_JFFS2_ZLIB
+	depends on ADK_TARGET_WITH_MTD
+	default n
+	help
+	  JFFS2 flash filesystem
 
 config ADK_KERNEL_SQUASHFS
 	prompt "SquashFS filesystem"
@@ -235,6 +241,8 @@ config ADK_KERNEL_SQUASHFS
 	select ADK_KERNEL_MISC_FILESYSTEMS
 	select ADK_KERNEL_SQUASHFS_XZ
 	default n
+	help
+	  Squashfs compressed read-only filesystem
 
 config ADK_KERNEL_YAFFS_FS
 	prompt "YAFFS2 filesystem"
@@ -245,6 +253,8 @@ config ADK_KERNEL_YAFFS_FS
 	select ADK_KERNEL_YAFFS_YAFFS1
 	select ADK_KERNEL_YAFFS_YAFFS2
 	select ADK_KERNEL_YAFFS_AUTO_YAFFS2
+	depends on ADK_TARGET_WITH_NAND
+	default n
 	help
 	  YAFFS2 filesystem for NAND devices
 
diff --git a/target/linux/patches/3.10.37/bsd-compatibility.patch b/target/linux/patches/3.10.40/bsd-compatibility.patch
index b954b658f..b954b658f 100644
--- a/target/linux/patches/3.10.37/bsd-compatibility.patch
+++ b/target/linux/patches/3.10.40/bsd-compatibility.patch
diff --git a/target/linux/patches/3.10.37/startup.patch b/target/linux/patches/3.10.40/startup.patch
index 3ebc5db1e..3ebc5db1e 100644
--- a/target/linux/patches/3.10.37/startup.patch
+++ b/target/linux/patches/3.10.40/startup.patch
diff --git a/target/linux/patches/3.10.40/yaffs2.patch b/target/linux/patches/3.10.40/yaffs2.patch
new file mode 100644
index 000000000..172629530
--- /dev/null
+++ b/target/linux/patches/3.10.40/yaffs2.patch
@@ -0,0 +1,16547 @@
+diff -Nur linux-3.10.40.orig/fs/Kconfig linux-3.10.40/fs/Kconfig
+--- linux-3.10.40.orig/fs/Kconfig	2014-05-13 14:00:04.000000000 +0200
++++ linux-3.10.40/fs/Kconfig	2014-05-17 12:48:10.000000000 +0200
+@@ -193,6 +193,7 @@
+ source "fs/befs/Kconfig"
+ source "fs/bfs/Kconfig"
+ source "fs/efs/Kconfig"
++source "fs/yaffs2/Kconfig"
+ source "fs/jffs2/Kconfig"
+ # UBIFS File system configuration
+ source "fs/ubifs/Kconfig"
+diff -Nur linux-3.10.40.orig/fs/Makefile linux-3.10.40/fs/Makefile
+--- linux-3.10.40.orig/fs/Makefile	2014-05-13 14:00:04.000000000 +0200
++++ linux-3.10.40/fs/Makefile	2014-05-17 12:48:10.000000000 +0200
+@@ -126,3 +126,4 @@
+ obj-$(CONFIG_CEPH_FS)		+= ceph/
+ obj-$(CONFIG_PSTORE)		+= pstore/
+ obj-$(CONFIG_EFIVAR_FS)		+= efivarfs/
++obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
+diff -Nur linux-3.10.40.orig/fs/yaffs2/Kconfig linux-3.10.40/fs/yaffs2/Kconfig
+--- linux-3.10.40.orig/fs/yaffs2/Kconfig	1970-01-01 01:00:00.000000000 +0100
++++ linux-3.10.40/fs/yaffs2/Kconfig	2014-05-17 12:48:10.000000000 +0200
+@@ -0,0 +1,171 @@
++#
++# yaffs file system configurations
++#
++
++config YAFFS_FS
++	tristate "yaffs2 file system support"
++	default n
++	depends on MTD_BLOCK
++	select YAFFS_YAFFS1
++	select YAFFS_YAFFS2
++	help
++	  yaffs2, or Yet Another Flash File System, is a file system
++	  optimised for NAND Flash chips.
++
++	  To compile the yaffs2 file system support as a module, choose M
++	  here: the module will be called yaffs2.
++
++	  If unsure, say N.
++
++	  Further information on yaffs2 is available at
++	  <http://www.aleph1.co.uk/yaffs/>.
++
++config YAFFS_YAFFS1
++	bool "512 byte / page devices"
++	depends on YAFFS_FS
++	default y
++	help
++	  Enable yaffs1 support -- yaffs for 512 byte / page devices
++
++	  Not needed for 2K-page devices.
++
++	  If unsure, say Y.
++
++config YAFFS_9BYTE_TAGS
++	bool "Use older-style on-NAND data format with pageStatus byte"
++	depends on YAFFS_YAFFS1
++	default n
++	help
++
++	  Older-style on-NAND data format has a "pageStatus" byte to record
++	  chunk/page state.  This byte is zero when the page is discarded.
++	  Choose this option if you have existing on-NAND data using this
++	  format that you need to continue to support.  New data written
++	  also uses the older-style format.  Note: Use of this option
++	  generally requires that MTD's oob layout be adjusted to use the
++	  older-style format.  See notes on tags formats and MTD versions
++	  in yaffs_mtdif1.c.
++
++	  If unsure, say N.
++
++config YAFFS_DOES_ECC
++	bool "Lets yaffs do its own ECC"
++	depends on YAFFS_FS && YAFFS_YAFFS1 && !YAFFS_9BYTE_TAGS
++	default n
++	help
++	  This enables yaffs to use its own ECC functions instead of using
++	  the ones from the generic MTD-NAND driver.
++
++	  If unsure, say N.
++
++config YAFFS_ECC_WRONG_ORDER
++	bool "Use the same ecc byte order as Steven Hill's nand_ecc.c"
++	depends on YAFFS_FS && YAFFS_DOES_ECC && !YAFFS_9BYTE_TAGS
++	default n
++	help
++	  This makes yaffs_ecc.c use the same ecc byte order as Steven
++	  Hill's nand_ecc.c. If not set, then you get the same ecc byte
++	  order as SmartMedia.
++
++	  If unsure, say N.
++
++config YAFFS_YAFFS2
++	bool "2048 byte (or larger) / page devices"
++	depends on YAFFS_FS
++	default y
++	help
++	  Enable yaffs2 support -- yaffs for >= 2K bytes per page devices
++
++	  If unsure, say Y.
++
++config YAFFS_AUTO_YAFFS2
++	bool "Autoselect yaffs2 format"
++	depends on YAFFS_YAFFS2
++	default y
++	help
++	  Without this, you need to explicitely use yaffs2 as the file
++	  system type. With this, you can say "yaffs" and yaffs or yaffs2
++	  will be used depending on the device page size (yaffs on
++	  512-byte page devices, yaffs2 on 2K page devices).
++
++	  If unsure, say Y.
++
++config YAFFS_DISABLE_TAGS_ECC
++	bool "Disable yaffs from doing ECC on tags by default"
++	depends on YAFFS_FS && YAFFS_YAFFS2
++	default n
++	help
++	  This defaults yaffs to using its own ECC calculations on tags instead of
++	  just relying on the MTD.
++	  This behavior can also be overridden with tags_ecc_on and
++	  tags_ecc_off mount options.
++
++	  If unsure, say N.
++
++config YAFFS_ALWAYS_CHECK_CHUNK_ERASED
++	bool "Force chunk erase check"
++	depends on YAFFS_FS
++	default n
++	help
++          Normally yaffs only checks chunks before writing until an erased
++	  chunk is found. This helps to detect any partially written
++	  chunks that might have happened due to power loss.
++
++	  Enabling this forces on the test that chunks are erased in flash
++	  before writing to them. This takes more time but is potentially
++	  a bit more secure.
++
++	  Suggest setting Y during development and ironing out driver
++	  issues etc. Suggest setting to N if you want faster writing.
++