13 files changed, 75 insertions, 56 deletions
diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice
index d732b5f7a..eaae2fe5e 100644
--- a/target/config/Config.in.arm.choice
+++ b/target/config/Config.in.arm.choice
@@ -2,21 +2,26 @@
 # material, please see the LICENCE file in the top-level directory.
 
 choice ADK_TARGET_ARM_CPU_ARCH
-prompt "CPU architecture"
+prompt "CPU architecture and family"
 depends on ADK_TARGET_TOOLCHAIN && ADK_LINUX_ARM
-default ADK_CPU_ARMV7A
 
-config ADK_CPU_ARMV5TE
-        boolean "armv5te"
-        select ADK_armv5te
+config ADK_CPU_ARMV7A_CORTEX_A9
+        boolean "cortex-a9 (armv7-a)"
+        select ADK_CPU_CORTEX_A9
 
-config ADK_CPU_ARMV6
-        boolean "armv6"
-        select ADK_armv6
+config ADK_CPU_ARMV7M_CORTEX_M3
+        boolean "cortex-m3 (armv7-m)"
+        select ADK_CPU_CORTEX_M3
+	select ADK_LINUX_ARM_WITH_THUMB
+	select ADK_TARGET_UCLINUX
 
-config ADK_CPU_ARMV7A
-        boolean "armv7-a"
-        select ADK_armv7a
+config ADK_CPU_ARMV6_ARM1176JZF_S
+        boolean "arm1176jzf-s (armv6)"
+        select ADK_CPU_ARM1176JZF_S
+
+config ADK_CPU_ARMV5TE_ARM926EJ_S
+        boolean "arm926ej-s (armv5te)"
+        select ADK_CPU_ARM926EJ_S
 
 endchoice
 
diff --git a/target/config/Config.in.arm.default b/target/config/Config.in.arm.default
index 50a05b674..3e6dac47b 100644
--- a/target/config/Config.in.arm.default
+++ b/target/config/Config.in.arm.default
@@ -1,21 +1,6 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-config ADK_armv5te
-	boolean
-
-config ADK_armv6
-	boolean
-
-config ADK_armv7a
-	boolean
-
-config ADK_TARGET_ARM_CPU
-	string
-	default "armv5te" if ADK_armv5te
-	default "armv6" if ADK_armv6
-	default "armv7-a" if ADK_armv7a
-
 config ADK_soft_float
 	boolean
 
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index b8fb302cb..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
 
@@ -113,6 +116,9 @@ config ADK_CPU_ARM926EJ_S
 config ADK_CPU_ARM1176JZF_S
 	boolean
 
+config ADK_CPU_CORTEX_M3
+	boolean
+
 config ADK_CPU_CORTEX_A9
 	boolean
 
@@ -141,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 f5c7a04f2..7a9cf94bb 100644
--- a/target/config/Config.in.kernelversion.choice
+++ b/target/config/Config.in.kernelversion.choice
@@ -4,22 +4,22 @@
 choice
 prompt "Kernel Version"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM && ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_KERNEL_VERSION_3_14_17 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-default ADK_KERNEL_VERSION_3_16_4
+default ADK_KERNEL_VERSION_3_14_26 if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+default ADK_KERNEL_VERSION_3_17.5
 
-config ADK_KERNEL_VERSION_3_16_4
-	prompt "3.16.4"
+config ADK_KERNEL_VERSION_3_17_5
+	prompt "3.17.5"
 	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_17
-	prompt "3.14.17"
+config ADK_KERNEL_VERSION_3_14_26
+	prompt "3.14.26"
 	boolean
 	select ADK_KERNEL_VERSION_3_14
 
-config ADK_KERNEL_VERSION_3_12_27
-	prompt "3.12.27"
+config ADK_KERNEL_VERSION_3_12_33
+	prompt "3.12.33"
 	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	boolean
diff --git a/target/config/Config.in.kernelversion.default b/target/config/Config.in.kernelversion.default
index 6c1d8c43b..28f1560e4 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,9 +18,9 @@ config ADK_KERNEL_VERSION_3_4
 
 config ADK_KERNEL_VERSION
 	string
-	default "3.16.4" if ADK_KERNEL_VERSION_3_16_4
-	default "3.14.17" if ADK_KERNEL_VERSION_3_14_17
-	default "3.12.27" if ADK_KERNEL_VERSION_3_12_27
+	default "3.17.4" if ADK_KERNEL_VERSION_3_17_4
+	default "3.14.26" if ADK_KERNEL_VERSION_3_14_26
+	default "3.12.33" if ADK_KERNEL_VERSION_3_12_33
 	default "3.10.53" if ADK_KERNEL_VERSION_3_10_53
 	default "3.4.103" if ADK_KERNEL_VERSION_3_4_103
 	help
diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu
index 04bd97c67..4f1ec85a4 100644
--- a/target/config/Config.in.qemu
+++ b/target/config/Config.in.qemu
@@ -32,15 +32,15 @@ choice
 prompt "Qemu XTENSA Emulation"
 depends on ADK_TARGET_SYSTEM_QEMU_XTENSA
 
-config ADK_TARGET_QEMU_XTENSA_DC232B
-	boolean "dc232b"
-	select ADK_KERNEL_XTENSA_VARIANT_DC232B
-
 config ADK_TARGET_QEMU_XTENSA_DC233C
 	boolean "dc233c"
 	select ADK_KERNEL_XTENSA_VARIANT_DC233C
 	select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
 
+config ADK_TARGET_QEMU_XTENSA_DC232B
+	boolean "dc232b"
+	select ADK_KERNEL_XTENSA_VARIANT_DC232B
+
 endchoice
 
 config ADK_TARGET_XTENSA
@@ -56,6 +56,14 @@ config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9
 	boolean "ARM Ltd. Versatile Express for Cortex-A9"
 	select ADK_CPU_CORTEX_A9
 
+config ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3
+	boolean "Stellaris LM3S6965EVB"
+	select ADK_soft_float
+	select ADK_eabi
+	select ADK_CPU_CORTEX_M3
+	select ADK_LINUX_ARM_WITH_THUMB
+	depends on ADK_TARGET_ARM_SOFT_FLOAT
+
 config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB
 	boolean "ARM Ltd. Versatile/PB"
 	select ADK_soft_float
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index 7087fbfa4..f3c0af9c7 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -96,6 +96,7 @@ config ADK_TARGET_QEMU_WITH_VIRTIO
 	select ADK_KERNEL_VIRTIO_PCI
 	select ADK_KERNEL_VIRTIO_NET
 	select ADK_KERNEL_VIRTIO_BLK
+	select ADK_KERNEL_VIRTIO_CONSOLE
 
 endchoice
 
diff --git a/target/config/Config.in.runtime b/target/config/Config.in.runtime
index 6b7ee495b..f69e561d4 100644
--- a/target/config/Config.in.runtime
+++ b/target/config/Config.in.runtime
@@ -57,7 +57,7 @@ config ADK_QUIET_KERNEL
 
 choice
 prompt "bootup messages from initscripts"
-default ADK_RUNTIME_QUIET_INIT if ADK_PKG_XBMCBOX
+default ADK_RUNTIME_QUIET_INIT if ADK_PKG_KODIBOX
 default ADK_RUNTIME_VERBOSE_INIT_VGA if ADK_TARGET_WITH_VGA || ADK_TARGET_QEMU_WITH_GRAPHIC || ADK_TARGET_QEMU_WITH_GRAPHIC_ONLY || ADK_TARGET_VBOX
 default ADK_RUNTIME_VERBOSE_INIT_SERIAL
 
@@ -76,7 +76,7 @@ endchoice
 choice
 prompt "start getty or shell after bootup"
 default ADK_RUNTIME_SHELL if ADK_PKG_TEST
-default ADK_RUNTIME_NONE if ADK_PKG_XBMCBOX
+default ADK_RUNTIME_NONE if ADK_PKG_KODIBOX
 default ADK_RUNTIME_GETTY
 
 config ADK_RUNTIME_GETTY
@@ -127,6 +127,7 @@ config ADK_RUNTIME_GETTY_SERIAL
 	  Start getty on serial console.
 
 config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
+	prompt "serial console device"
 	string
 	default "hvc0" if ADK_TARGET_SYSTEM_QEMU_PPC64
 	default "ttyUL0" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800
@@ -137,8 +138,10 @@ config ADK_RUNTIME_CONSOLE_SERIAL_DEVICE
 	default "ttyS0"
 
 config ADK_RUNTIME_CONSOLE_SERIAL_SPEED
+	prompt "serial console speed"
 	string
 	default "9600" if ADK_TARGET_SYSTEM_FON_FON2100
+	default "9600" if ADK_TARGET_SYSTEM_RASPBERRY_PI
 	default "38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP	
 	default "115200"
 
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 0415e0ce5..286c3521b 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -22,7 +22,7 @@ config ADK_TARGET_CFLAGS
 	default "-march=atom" if ADK_CPU_ATOM
 	default "-march=amdfam10" if ADK_CPU_AMDFAM10
 	default "-mcpu=v8" if ADK_CPU_SPARC_V8
-	default "-m64 -mcpu=ultrasparc" if ADK_CPU_SPARC_V9
+	default "-mcpu=ultrasparc -m64" if ADK_CPU_SPARC_V9
 	default "-march=loongson2f -Wa,-mfix-loongson2f-nop" if ADK_CPU_LOONGSON2F
 	default "-march=mips32" if ADK_CPU_MIPS32
 	default "-march=mips64" if ADK_CPU_MIPS64
@@ -32,8 +32,9 @@ config ADK_TARGET_CFLAGS
 	default "-march=armv5te -mtune=arm926ej-s -mfloat-abi=hard" if ADK_CPU_ARM926EJ_S && ADK_hard_float
 	default "-march=armv6 -mtune=arm1176jzf-s -mfloat-abi=soft" if ADK_CPU_ARM1176JZF_S && ADK_soft_float
 	default "-march=armv6 -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" if ADK_CPU_ARM1176JZF_S && ADK_hard_float
-	default "-march=armv7-a -mtune=cortex-a9 -mfloat-abi=soft" if ADK_CPU_CORTEX_A9 && ADK_soft_float
-	default "-march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard" if ADK_CPU_CORTEX_A9 && ADK_hard_float
+	default "-mcpu=cortex-m3 -mfloat-abi=soft" if ADK_CPU_CORTEX_M3 && ADK_soft_float
+	default "-mcpu=cortex-a9 -mfloat-abi=soft" if ADK_CPU_CORTEX_A9 && ADK_soft_float
+	default "-mcpu=cortex-a9 -mfpu=neon -mfloat-abi=hard" if ADK_CPU_CORTEX_A9 && ADK_hard_float
 	default "-march=armv5te" if ADK_CPU_ARMV5TE
 	default "-march=armv6" if ADK_CPU_ARMV6
 	default "-march=armv7-a" if ADK_CPU_ARMV7A
@@ -50,8 +51,8 @@ config ADK_TARGET_CMDLINE
 	default "console=ttyS0,115200 console=tty0" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_VGA
 	default "console=tty0 console=ttyS0,115200" if ADK_TARGET_SYSTEM_IBM_X40 && ADK_RUNTIME_VERBOSE_INIT_SERIAL
 	default "console=tty0" if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	default "console=ttyAMA0 console=tty1" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_VGA
-	default "console=tty1 console=ttyAMA0" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_SERIAL
+	default "console=ttyAMA0,9600 console=tty1" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_VGA
+	default "console=tty1 console=ttyAMA0,9600" if ADK_TARGET_SYSTEM_RASPBERRY_PI && ADK_RUNTIME_VERBOSE_INIT_SERIAL
 	default "console=ttyS0,115200 console=tty0 fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	default "console=ttyS0,9600" if ADK_TARGET_SYSTEM_FON_FON2100
 	default "console=ttyS0,38400" if ADK_TARGET_SYSTEM_PCENGINES_WRAP
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 16c075212..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"
@@ -130,11 +132,13 @@ config ADK_TARGET_CFLAGS_OPT_O0
 endchoice
 
 config ADK_LINUX_ARM_WITH_THUMB
-	prompt "Use THUMB2 ARM mode"
+	prompt "Use THUMB2 only mode"
 	boolean
-	depends on ADK_CPU_CORTEX_A9 && ADK_TARGET_LIB_GLIBC
 	select ADK_KERNEL_THUMB2_KERNEL
 	default n
+	depends on ADK_LINUX_ARM
+	help
+	  Experimental option. Use with care.
 
 config ADK_TOOLCHAIN_WITH_SSP
 	boolean
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index bdfca0606..965a9125e 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -34,6 +34,7 @@ config ADK_HOST_BUILD_LIBTOOL
 config ADK_HOST_BUILD_U_BOOT
 	boolean
 	default n if ADK_HOST_DARWIN
+	default n if ADK_HOST_CYGWIN
 	default y
 
 # always required, but can be provided by host