Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 21 insertions, 10 deletions

diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index afb99ebc9..4e77bcf63 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -49,6 +49,9 @@ config ADK_CPU_ARC
 config ADK_CPU_TILE
 	boolean
 
+config ADK_CPU_C6X
+	boolean
+
 config ADK_CPU_CRIS_V10
 	boolean
 
@@ -144,6 +147,7 @@ config ADK_TARGET_CPU_ARCH
 	default "arceb" if ADK_CPU_ARC && ADK_big
 	default "avr32" if ADK_CPU_AVR32
 	default "bfin" if ADK_CPU_BFIN
+	default "c6x" if ADK_CPU_C6X
 	default "cris" if ADK_CPU_CRIS_V10
 	default "crisv32" if ADK_CPU_CRIS_V32
 	default "i486" if ADK_CPU_I486
diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice
index 4e866b6c5..d89184ab0 100644
--- a/target/config/Config.in.endian.choice
+++ b/target/config/Config.in.endian.choice
@@ -5,12 +5,14 @@ choice ADK_TARGET_ENDIAN_MODE
 prompt "Target Endianess"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
 depends on ADK_LINUX_SH || ADK_LINUX_MIPS || ADK_LINUX_MICROBLAZE \
-	|| ADK_LINUX_MIPS64 || ADK_LINUX_ARC || ADK_LINUX_ARM
+	|| ADK_LINUX_MIPS64 || ADK_LINUX_ARC || ADK_LINUX_ARM || ADK_LINUX_C6X
 depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
+depends on !ADK_TARGET_SYSTEM_DRAGINO_MS14S
 depends on !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
 depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 depends on !ADK_TARGET_SYSTEM_QEMU_ARM
+depends on !ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 
 config ADK_TARGET_LITTLE_ENDIAN
 	boolean "Little endian"
diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel
index add212587..02b99a5c2 100644
--- a/target/config/Config.in.kernel
+++ b/target/config/Config.in.kernel
@@ -59,9 +59,11 @@ config ADK_TARGET_KERNEL_MINICONFIG
 	default "solidrun-imx6" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	default "raspberry-pi" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "sharp-zaurus" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	default "linksys-nslu2" if ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	default "lemote-yeelong" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	default "mikrotik-rb4xx" if ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	default "mikrotik-rb532" if ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	default "dragino-ms14s" if ADK_TARGET_SYSTEM_DRAGINO_MS14S
 	default "generic-pc" if ADK_TARGET_SYSTEM_GENERIC_PC
 	default "pcengines-apu" if ADK_TARGET_SYSTEM_PCENGINES_APU
 
diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice
index 4ea43d591..9d1af6b8c 100644
--- a/target/config/Config.in.kernelversion.choice
+++ b/target/config/Config.in.kernelversion.choice
@@ -5,13 +5,13 @@ choice
 prompt "Kernel Version"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING
 default ADK_KERNEL_VERSION_3_14_22 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-default ADK_KERNEL_VERSION_3_16_6
+default ADK_KERNEL_VERSION_3_17.4
 
-config ADK_KERNEL_VERSION_3_16_6
-	prompt "3.16.6"
+config ADK_KERNEL_VERSION_3_17_4
+	prompt "3.17.4"
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	boolean
-	select ADK_KERNEL_VERSION_3_16
+	select ADK_KERNEL_VERSION_3_17
 
 config ADK_KERNEL_VERSION_3_14_22
 	prompt "3.14.22"
diff --git a/target/config/Config.in.kernelversion.default b/target/config/Config.in.kernelversion.default
index d02b41730..9209c4527 100644
--- a/target/config/Config.in.kernelversion.default
+++ b/target/config/Config.in.kernelversion.default
@@ -1,7 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config ADK_KERNEL_VERSION_3_16
+config ADK_KERNEL_VERSION_3_17
 	boolean
 
 config ADK_KERNEL_VERSION_3_14
@@ -18,7 +18,7 @@ config ADK_KERNEL_VERSION_3_4
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.16.6" if ADK_KERNEL_VERSION_3_16_6
+	default "3.17.4" if ADK_KERNEL_VERSION_3_17_4
 	default "3.14.22" if ADK_KERNEL_VERSION_3_14_22
 	default "3.12.33" if ADK_KERNEL_VERSION_3_12_33
 	default "3.10.53" if ADK_KERNEL_VERSION_3_10_53
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index a5c91f0f7..7d4dbad74 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -26,7 +26,7 @@ config ADK_TOOLCHAIN_GCC_4_5_4
 config ADK_TOOLCHAIN_GCC_4_7_4
 	prompt "4.7.4"
 	boolean
-	depends on ADK_LINUX_CRIS
+	depends on ADK_LINUX_CRIS || ADK_LINUX_C6X
 
 config ADK_TOOLCHAIN_GCC_4_8_0_ARC
 	prompt "4.8.0-arc"
@@ -42,14 +42,16 @@ config ADK_TOOLCHAIN_GCC_4_8_3
 	depends on !ADK_LINUX_AVR32
 	depends on !ADK_LINUX_CRIS
 	depends on !ADK_LINUX_TILE
+	depends on !ADK_LINUX_C6X
 
-config ADK_TOOLCHAIN_GCC_4_9_1
-	prompt "4.9.1"
+config ADK_TOOLCHAIN_GCC_4_9_2
+	prompt "4.9.2"
 	boolean
 	depends on !ADK_LINUX_BFIN
 	depends on !ADK_LINUX_ARC
 	depends on !ADK_LINUX_AVR32
 	depends on !ADK_LINUX_CRIS
+	depends on !ADK_LINUX_C6X
 
 config ADK_TOOLCHAIN_GCC_GIT
 	prompt "git"
@@ -134,6 +136,7 @@ config ADK_LINUX_ARM_WITH_THUMB
 	boolean
 	select ADK_KERNEL_THUMB2_KERNEL
 	default n
+	depends on ADK_LINUX_ARM
 	help
 	  Experimental option. Use with care.