50 files changed, 28 insertions, 17 deletions
diff --git a/Config.in b/Config.in
index 103e92075..a43ea3e13 100644
--- a/Config.in
+++ b/Config.in
@@ -95,7 +95,7 @@ prompt "Kernel Version"
 depends on ADK_TOOLCHAIN_ONLY
 
 config ADK_KERNEL_VERSION_TOOLCHAIN
-	prompt "3.5.4"
+	prompt "3.5.6"
 	boolean
 	depends on ADK_TOOLCHAIN_ONLY
 
@@ -106,20 +106,25 @@ depends on !ADK_TOOLCHAIN_ONLY && !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_
 
 choice
 prompt "Kernel Version"
-config ADK_KERNEL_VERSION_3_5_4
-	prompt "3.5.4"
+config ADK_KERNEL_VERSION_3_6_1
+	prompt "3.6.1"
 	boolean
 
-config ADK_KERNEL_VERSION_3_4_9
-	prompt "3.4.9"
+config ADK_KERNEL_VERSION_3_5_6
+	prompt "3.5.6"
+	boolean
+
+config ADK_KERNEL_VERSION_3_4_13
+	prompt "3.4.13"
 	boolean
 
 endchoice
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.4.9" if ADK_KERNEL_VERSION_3_4_9
-	default "3.5.4" if ADK_KERNEL_VERSION_3_5_4
+	default "3.4.13" if ADK_KERNEL_VERSION_3_4_13
+	default "3.5.6" if ADK_KERNEL_VERSION_3_5_6
+	default "3.6.1" if ADK_KERNEL_VERSION_3_6_1
 	help
 
 choice
diff --git a/mk/kernel-ver.mk b/mk/kernel-ver.mk
index f52834616..87a861da7 100644
--- a/mk/kernel-ver.mk
+++ b/mk/kernel-ver.mk
@@ -1,17 +1,23 @@
 ifeq ($(ADK_KERNEL_VERSION_TOOLCHAIN),y)
-KERNEL_VERSION:=	3.5.4
+KERNEL_VERSION:=	3.5.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		95d5c7271ad448bc965bdb29339b6923
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_5_4),y)
-KERNEL_VERSION:=	3.5.4
+ifeq ($(ADK_KERNEL_VERSION_3_6_1),y)
+KERNEL_VERSION:=	3.6.1
+KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
+KERNEL_RELEASE:=	1
+KERNEL_MD5SUM:=		63bdd7d325afae1ac525586d24eb5399
+endif
+ifeq ($(ADK_KERNEL_VERSION_3_5_6),y)
+KERNEL_VERSION:=	3.5.6
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		95d5c7271ad448bc965bdb29339b6923
 endif
-ifeq ($(ADK_KERNEL_VERSION_3_4_9),y)
-KERNEL_VERSION:=	3.4.9
+ifeq ($(ADK_KERNEL_VERSION_3_4_13),y)
+KERNEL_VERSION:=	3.4.13
 KERNEL_MOD_VERSION:=	$(KERNEL_VERSION)
 KERNEL_RELEASE:=	1
 KERNEL_MD5SUM:=		f9cd4fe763396bf814f3a71de42fde9b
diff --git a/target/linux/patches/3.4.9/bsd-compatibility.patch b/target/linux/patches/3.4.13/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.9/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.13/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.9/cris-etrax.patch b/target/linux/patches/3.4.13/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.4.9/cris-etrax.patch
+++ b/target/linux/patches/3.4.13/cris-etrax.patch
diff --git a/target/linux/patches/3.4.9/defaults.patch b/target/linux/patches/3.4.13/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.9/defaults.patch
+++ b/target/linux/patches/3.4.13/defaults.patch
diff --git a/target/linux/patches/3.4.9/gemalto.patch b/target/linux/patches/3.4.13/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.9/gemalto.patch
+++ b/target/linux/patches/3.4.13/gemalto.patch
diff --git a/target/linux/patches/3.4.9/lemote-rfkill.patch b/target/linux/patches/3.4.13/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.9/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.13/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.9/mmc-host.patch b/target/linux/patches/3.4.13/mmc-host.patch
index 3d0e37add..3d0e37add 100644
--- a/target/linux/patches/3.4.9/mmc-host.patch
+++ b/target/linux/patches/3.4.13/mmc-host.patch
diff --git a/target/linux/patches/3.4.9/module-alloc-size-check.patch b/target/linux/patches/3.4.13/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.9/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.13/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.9/non-static.patch b/target/linux/patches/3.4.13/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.9/non-static.patch
+++ b/target/linux/patches/3.4.13/non-static.patch
diff --git a/target/linux/patches/3.4.9/sparc-include.patch b/target/linux/patches/3.4.13/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.9/sparc-include.patch
+++ b/target/linux/patches/3.4.13/sparc-include.patch
diff --git a/target/linux/patches/3.4.9/startup.patch b/target/linux/patches/3.4.13/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.4.9/startup.patch
+++ b/target/linux/patches/3.4.13/startup.patch
diff --git a/target/linux/patches/3.4.9/usb-defaults-off.patch b/target/linux/patches/3.4.13/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.9/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.13/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.9/uuid.patch b/target/linux/patches/3.4.13/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.9/uuid.patch
+++ b/target/linux/patches/3.4.13/uuid.patch
diff --git a/target/linux/patches/3.4.9/vga-cons-default-off.patch b/target/linux/patches/3.4.13/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.9/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.13/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.9/wlan-cf.patch b/target/linux/patches/3.4.13/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.9/wlan-cf.patch
+++ b/target/linux/patches/3.4.13/wlan-cf.patch
diff --git a/target/linux/patches/3.4.9/zlib-inflate.patch b/target/linux/patches/3.4.13/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.9/zlib-inflate.patch
+++ b/target/linux/patches/3.4.13/zlib-inflate.patch
diff --git a/target/linux/patches/3.5.4/brcm.patch b/target/linux/patches/3.5.6/brcm.patch
index a94b2302d..a94b2302d 100644
--- a/target/linux/patches/3.5.4/brcm.patch
+++ b/target/linux/patches/3.5.6/brcm.patch
diff --git a/target/linux/patches/3.5.4/bsd-compatibility.patch b/target/linux/patches/3.5.6/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.5.4/bsd-compatibility.patch
+++ b/target/linux/patches/3.5.6/bsd-compatibility.patch
diff --git a/target/linux/patches/3.5.4/cris-etrax.patch b/target/linux/patches/3.5.6/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.5.4/cris-etrax.patch
+++ b/target/linux/patches/3.5.6/cris-etrax.patch
diff --git a/target/linux/patches/3.5.4/defaults.patch b/target/linux/patches/3.5.6/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.5.4/defaults.patch
+++ b/target/linux/patches/3.5.6/defaults.patch
diff --git a/target/linux/patches/3.5.4/gemalto.patch b/target/linux/patches/3.5.6/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.5.4/gemalto.patch
+++ b/target/linux/patches/3.5.6/gemalto.patch
diff --git a/target/linux/patches/3.5.4/lemote-rfkill.patch b/target/linux/patches/3.5.6/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.5.4/lemote-rfkill.patch
+++ b/target/linux/patches/3.5.6/lemote-rfkill.patch
diff --git a/target/linux/patches/3.5.4/mmc-host.patch b/target/linux/patches/3.5.6/mmc-host.patch
index 3d0e37add..3d0e37add 100644
--- a/target/linux/patches/3.5.4/mmc-host.patch
+++ b/target/linux/patches/3.5.6/mmc-host.patch
diff --git a/target/linux/patches/3.5.4/module-alloc-size-check.patch b/target/linux/patches/3.5.6/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.5.4/module-alloc-size-check.patch
+++ b/target/linux/patches/3.5.6/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.5.4/mtd-rootfs.patch b/target/linux/patches/3.5.6/mtd-rootfs.patch
index 775d5fc80..775d5fc80 100644
--- a/target/linux/patches/3.5.4/mtd-rootfs.patch
+++ b/target/linux/patches/3.5.6/mtd-rootfs.patch
diff --git a/target/linux/patches/3.5.4/non-static.patch b/target/linux/patches/3.5.6/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.5.4/non-static.patch
+++ b/target/linux/patches/3.5.6/non-static.patch
diff --git a/target/linux/patches/3.5.4/startup.patch b/target/linux/patches/3.5.6/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.5.4/startup.patch
+++ b/target/linux/patches/3.5.6/startup.patch
diff --git a/target/linux/patches/3.5.4/usb-defaults-off.patch b/target/linux/patches/3.5.6/usb-defaults-off.patch
index 54dff2bd4..54dff2bd4 100644
--- a/target/linux/patches/3.5.4/usb-defaults-off.patch
+++ b/target/linux/patches/3.5.6/usb-defaults-off.patch
diff --git a/target/linux/patches/3.5.4/uuid.patch b/target/linux/patches/3.5.6/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.5.4/uuid.patch
+++ b/target/linux/patches/3.5.6/uuid.patch
diff --git a/target/linux/patches/3.5.4/vga-cons-default-off.patch b/target/linux/patches/3.5.6/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.5.4/vga-cons-default-off.patch
+++ b/target/linux/patches/3.5.6/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.5.4/wlan-cf.patch b/target/linux/patches/3.5.6/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.5.4/wlan-cf.patch
+++ b/target/linux/patches/3.5.6/wlan-cf.patch
diff --git a/target/linux/patches/3.5.4/zlib-inflate.patch b/target/linux/patches/3.5.6/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.5.4/zlib-inflate.patch
+++ b/target/linux/patches/3.5.6/zlib-inflate.patch
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index 3529d9124..9658744cc 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -48,7 +48,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 			$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
 		); \
 		touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs.h; \
-		touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs-{32,x32,64}.h; \
+		touch $(STAGING_TARGET_DIR)-$${abi/*:/}/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h; \
 	done
 	touch $@
 else
@@ -76,7 +76,7 @@ $(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
 		$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
 	);
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h
 	touch $@
 endif
 
@@ -135,7 +135,7 @@ ifeq ($(ADK_TARGET_ABI_X32),y)
 	${EGLIBC_ENV} $(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL)-x32 install_root=$(STAGING_TARGET_DIR) install
 endif
 	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
-	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64}.h
+	touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs-{32,x32,64,o32,n32}.h
 	# for libgcc build we need C library files, 64 bit default
 	mkdir -p $(STAGING_TARGET_DIR)/lib/$(REAL_GNU_TARGET_NAME)/4.7.2 ; \
 	$(CP) $(STAGING_TARGET_DIR)-64/lib/* $(STAGING_TARGET_DIR)-64/usr/lib/* \
diff --git a/toolchain/eglibc/Makefile.multilib b/toolchain/eglibc/Makefile.multilib
index 517fbed26..5066aecbc 100644
--- a/toolchain/eglibc/Makefile.multilib
+++ b/toolchain/eglibc/Makefile.multilib
@@ -25,10 +25,10 @@ endif
 endif
 ifeq ($(ADK_TARGET_MULTILIB_MIPS_O32),y)
 ifeq ($(ADK_KERNEL_CPU_LITTLE_ENDIAN),y)
-TABI+=mips64el-openadk-linux-gnu:o32
+TABI+=mips64el-openadk-linux-gnu:32
 TCFLAGS:=-mabi=
 else
-TABI+=mips64-openadk-linux-gnu:o32
+TABI+=mips64-openadk-linux-gnu:32
 TCFLAGS:=-mabi=
 endif
 endif
diff --git a/toolchain/kernel-headers/patches/3.4.9/aufs2.patch b/toolchain/kernel-headers/patches/3.4.13/aufs2.patch
index d40c9a3fe..d40c9a3fe 100644
--- a/toolchain/kernel-headers/patches/3.4.9/aufs2.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/aufs2.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/cleankernel.patch b/toolchain/kernel-headers/patches/3.4.13/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/3.4.9/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/etrax-header.patch b/toolchain/kernel-headers/patches/3.4.13/etrax-header.patch
index 559c0f322..559c0f322 100644
--- a/toolchain/kernel-headers/patches/3.4.9/etrax-header.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/etrax-header.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.4.13/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/3.4.9/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/microperl.patch b/toolchain/kernel-headers/patches/3.4.13/microperl.patch
index 44c39f6e8..44c39f6e8 100644
--- a/toolchain/kernel-headers/patches/3.4.9/microperl.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/microperl.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/mkpiggy.patch b/toolchain/kernel-headers/patches/3.4.13/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.4.9/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.4.9/relocs.patch b/toolchain/kernel-headers/patches/3.4.13/relocs.patch
index 43c5bb580..43c5bb580 100644
--- a/toolchain/kernel-headers/patches/3.4.9/relocs.patch
+++ b/toolchain/kernel-headers/patches/3.4.13/relocs.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/aufs2.patch b/toolchain/kernel-headers/patches/3.5.6/aufs2.patch
index d40c9a3fe..d40c9a3fe 100644
--- a/toolchain/kernel-headers/patches/3.5.4/aufs2.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/aufs2.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/cleankernel.patch b/toolchain/kernel-headers/patches/3.5.6/cleankernel.patch
index f8d5448ee..f8d5448ee 100644
--- a/toolchain/kernel-headers/patches/3.5.4/cleankernel.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/cleankernel.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/etrax-header.patch b/toolchain/kernel-headers/patches/3.5.6/etrax-header.patch
index 03d19a9ab..03d19a9ab 100644
--- a/toolchain/kernel-headers/patches/3.5.4/etrax-header.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/etrax-header.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/linux-gcc-check.patch b/toolchain/kernel-headers/patches/3.5.6/linux-gcc-check.patch
index 7cc381845..7cc381845 100644
--- a/toolchain/kernel-headers/patches/3.5.4/linux-gcc-check.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/linux-gcc-check.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/microperl.patch b/toolchain/kernel-headers/patches/3.5.6/microperl.patch
index 44c39f6e8..44c39f6e8 100644
--- a/toolchain/kernel-headers/patches/3.5.4/microperl.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/microperl.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/mkpiggy.patch b/toolchain/kernel-headers/patches/3.5.6/mkpiggy.patch
index d4e815cd2..d4e815cd2 100644
--- a/toolchain/kernel-headers/patches/3.5.4/mkpiggy.patch
+++ b/toolchain/kernel-headers/patches/3.5.6/mkpiggy.patch
diff --git a/toolchain/kernel-headers/patches/3.5.4/relocs.patch b/toolchain/kernel-headers/patches/3.5.6/relocs.patch
index 43c5bb580..43c5bb580 100644
--- a/toolchain/kernel-headers/patches/3.5.4/relocs.patch
+++ b/