remove unneeded split in choice and default, remove ADK_TARGET_KERNEL_VERSION (unused)

33 files changed, 653 insertions, 743 deletions

diff --git a/target/config/Config.in.abi b/target/config/Config.in.abi
index 6e900441b..664270f14 100644
--- a/target/config/Config.in.abi
+++ b/target/config/Config.in.abi
@@ -1,5 +1,68 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.abi.choice
-source target/config/Config.in.abi.default
+choice
+prompt "ABI"
+depends on ADK_TARGET_ARCH_MIPS64
+
+config ADK_TARGET_ABI_N32
+	bool "N32 ABI"
+
+config ADK_TARGET_ABI_N64
+	bool "N64 ABI"
+
+config ADK_TARGET_ABI_O32
+	bool "O32 ABI"
+
+endchoice
+
+choice
+prompt "ABI"
+depends on ADK_TARGET_ARCH_X86_64 && \
+	(ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL)
+
+config ADK_TARGET_ABI_64
+	bool "64 Bit ABI"
+
+config ADK_TARGET_ABI_X32
+	bool "x32 ABI"
+
+endchoice
+
+config ADK_TARGET_ABI
+	string
+	default "o32" if ADK_TARGET_ABI_O32
+	default "n32" if ADK_TARGET_ABI_N32
+	default "n64" if ADK_TARGET_ABI_N64
+	default "32" if ADK_TARGET_ABI_32
+	default "x32" if ADK_TARGET_ABI_X32
+	default "eabihf" if ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
+	default "eabi" if ADK_TARGET_ARCH_ARM
+
+config ADK_TARGET_MIPS_ABI
+	depends on ADK_TARGET_ARCH_MIPS64
+	string
+	default "32" if ADK_TARGET_ABI_O32
+	default "n32" if ADK_TARGET_ABI_N32
+	default "64" if ADK_TARGET_ABI_N64
+
+config ADK_TARGET_LIBC_PATH
+	string
+	default "lib32" if ADK_TARGET_ABI_N32
+	default "libx32" if ADK_TARGET_ABI_X32
+	default "lib64" if ADK_TARGET_ABI_64 || ADK_TARGET_ABI_N64 \
+			|| ADK_TARGET_ARCH_AARCH64 \
+			|| ADK_TARGET_ARCH_SPARC64 \
+			|| ADK_TARGET_ARCH_PPC64 \
+			|| ADK_TARGET_ARCH_X86_64
+	default "lib"
+
+config ADK_TARGET_ABI_CFLAGS
+	string
+	default "-mabi=32" if ADK_TARGET_ABI_O32
+	default "-mabi=n32" if ADK_TARGET_ABI_N32
+	default "-mabi=64" if ADK_TARGET_ABI_N64
+	default "-m32" if ADK_TARGET_ABI_32
+	default "-mx32" if ADK_TARGET_ABI_X32
+	default "-m64" if ADK_TARGET_ABI_64
+
diff --git a/target/config/Config.in.abi.choice b/target/config/Config.in.abi.choice
deleted file mode 100644
index df60f4227..000000000
--- a/target/config/Config.in.abi.choice
+++ /dev/null
@@ -1,30 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice
-prompt "ABI"
-depends on ADK_TARGET_ARCH_MIPS64
-
-config ADK_TARGET_ABI_N32
-	bool "N32 ABI"
-
-config ADK_TARGET_ABI_N64
-	bool "N64 ABI"
-
-config ADK_TARGET_ABI_O32
-	bool "O32 ABI"
-
-endchoice
-
-choice
-prompt "ABI"
-depends on ADK_TARGET_ARCH_X86_64 && \
-	(ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL)
-
-config ADK_TARGET_ABI_64
-	bool "64 Bit ABI"
-
-config ADK_TARGET_ABI_X32
-	bool "x32 ABI"
-
-endchoice
diff --git a/target/config/Config.in.abi.default b/target/config/Config.in.abi.default
deleted file mode 100644
index d96acbd51..000000000
--- a/target/config/Config.in.abi.default
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-config ADK_TARGET_ABI
-	string
-	default "o32" if ADK_TARGET_ABI_O32
-	default "n32" if ADK_TARGET_ABI_N32
-	default "n64" if ADK_TARGET_ABI_N64
-	default "32" if ADK_TARGET_ABI_32
-	default "x32" if ADK_TARGET_ABI_X32
-	default "eabihf" if ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
-	default "eabi" if ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_MIPS_ABI
-	depends on ADK_TARGET_ARCH_MIPS64
-	string
-	default "32" if ADK_TARGET_ABI_O32
-	default "n32" if ADK_TARGET_ABI_N32
-	default "64" if ADK_TARGET_ABI_N64
-
-config ADK_TARGET_LIBC_PATH
-	string
-	default "lib32" if ADK_TARGET_ABI_N32
-	default "libx32" if ADK_TARGET_ABI_X32
-	default "lib64" if ADK_TARGET_ABI_64 || ADK_TARGET_ABI_N64 \
-			|| ADK_TARGET_ARCH_AARCH64 \
-			|| ADK_TARGET_ARCH_SPARC64 \
-			|| ADK_TARGET_ARCH_PPC64 \
-			|| ADK_TARGET_ARCH_X86_64
-	default "lib"
-
-config ADK_TARGET_ABI_CFLAGS
-	string
-	default "-mabi=32" if ADK_TARGET_ABI_O32
-	default "-mabi=n32" if ADK_TARGET_ABI_N32
-	default "-mabi=64" if ADK_TARGET_ABI_N64
-	default "-m32" if ADK_TARGET_ABI_32
-	default "-mx32" if ADK_TARGET_ABI_X32
-	default "-m64" if ADK_TARGET_ABI_64
-
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index ac91aff4d..3ab18c8cb 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -1,5 +1,46 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.binutils.choice
-source target/config/Config.in.binutils.default
+choice
+prompt "Binutils version"
+default ADK_TOOLCHAIN_BINUTILS_2_20_1 if ADK_TARGET_ARCH_AVR32
+default ADK_TOOLCHAIN_BINUTILS_2_22 if ADK_TARGET_ARCH_BFIN
+default ADK_TOOLCHAIN_BINUTILS_2_23_ARC if ADK_TARGET_ARCH_ARC
+default ADK_TOOLCHAIN_BINUTILS_2_25_1
+
+config ADK_TOOLCHAIN_BINUTILS_GIT
+	bool "git"
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_CRIS
+
+config ADK_TOOLCHAIN_BINUTILS_2_25_1
+	bool "2.25.1"
+	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_CPU_CRIS_V10
+
+config ADK_TOOLCHAIN_BINUTILS_2_24
+	bool "2.24"
+	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_CRIS
+	depends on !ADK_TARGET_ARCH_H8300
+
+config ADK_TOOLCHAIN_BINUTILS_2_23_ARC
+	bool "2.23-arc"
+	depends on ADK_TARGET_ARCH_ARC
+
+config ADK_TOOLCHAIN_BINUTILS_2_22
+	bool "2.22"
+	depends on ADK_TARGET_ARCH_BFIN \
+		|| ADK_CPU_CRIS_V10
+
+config ADK_TOOLCHAIN_BINUTILS_2_20_1
+	bool "2.20.1"
+	depends on ADK_TARGET_ARCH_AVR32
+
+endchoice
diff --git a/target/config/Config.in.binutils.choice b/target/config/Config.in.binutils.choice
deleted file mode 100644
index 3ab18c8cb..000000000
--- a/target/config/Config.in.binutils.choice
+++ /dev/null
@@ -1,46 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice
-prompt "Binutils version"
-default ADK_TOOLCHAIN_BINUTILS_2_20_1 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_BINUTILS_2_22 if ADK_TARGET_ARCH_BFIN
-default ADK_TOOLCHAIN_BINUTILS_2_23_ARC if ADK_TARGET_ARCH_ARC
-default ADK_TOOLCHAIN_BINUTILS_2_25_1
-
-config ADK_TOOLCHAIN_BINUTILS_GIT
-	bool "git"
-	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_CRIS
-
-config ADK_TOOLCHAIN_BINUTILS_2_25_1
-	bool "2.25.1"
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_CPU_CRIS_V10
-
-config ADK_TOOLCHAIN_BINUTILS_2_24
-	bool "2.24"
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_CRIS
-	depends on !ADK_TARGET_ARCH_H8300
-
-config ADK_TOOLCHAIN_BINUTILS_2_23_ARC
-	bool "2.23-arc"
-	depends on ADK_TARGET_ARCH_ARC
-
-config ADK_TOOLCHAIN_BINUTILS_2_22
-	bool "2.22"
-	depends on ADK_TARGET_ARCH_BFIN \
-		|| ADK_CPU_CRIS_V10
-
-config ADK_TOOLCHAIN_BINUTILS_2_20_1
-	bool "2.20.1"
-	depends on ADK_TARGET_ARCH_AVR32
-
-endchoice
diff --git a/target/config/Config.in.binutils.default b/target/config/Config.in.binutils.default
deleted file mode 100644
index 3748dec66..000000000
--- a/target/config/Config.in.binutils.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
diff --git a/target/config/Config.in.endian b/target/config/Config.in.endian
index c21085389..69e89c9e8 100644
--- a/target/config/Config.in.endian
+++ b/target/config/Config.in.endian
@@ -1,5 +1,44 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.endian.choice
-source target/config/Config.in.endian.default
+choice ADK_TARGET_ENDIAN_MODE
+prompt "Endianess"
+depends on ADK_TARGET_ARCH_ARC \
+	|| ADK_TARGET_ARCH_AARCH64 \
+	|| ADK_TARGET_ARCH_ARM \
+	|| ADK_TARGET_ARCH_C6X \
+	|| ADK_TARGET_ARCH_MICROBLAZE \
+	|| ADK_TARGET_ARCH_MIPS \
+	|| ADK_TARGET_ARCH_MIPS64 \
+	|| ADK_TARGET_ARCH_PPC64 \
+	|| ADK_TARGET_ARCH_SH \
+	|| ADK_TARGET_ARCH_XTENSA
+
+config ADK_TARGET_LITTLE_ENDIAN
+	bool "Little endian"
+	depends on !ADK_TARGET_SYSTEM_DRAGINO_MS14S
+	depends on !ADK_TARGET_SYSTEM_LINKSYS_NSLU2
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
+
+config ADK_TARGET_BIG_ENDIAN
+	bool "Big endian"
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	depends on !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_QEMU_ARM
+	depends on !ADK_TARGET_SYSTEM_QEMU_XTENSA
+	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	
+endchoice
+
+config ADK_TARGET_ENDIAN
+	string
+	default "little" if ADK_TARGET_LITTLE_ENDIAN
+	default "big" if ADK_TARGET_BIG_ENDIAN
+
+config ADK_JFFS2_OPTS
+	string
+	default "-l" if ADK_TARGET_LITTLE_ENDIAN
+	default "-b" if ADK_TARGET_BIG_ENDIAN
diff --git a/target/config/Config.in.endian.choice b/target/config/Config.in.endian.choice
deleted file mode 100644
index 2bb48a165..000000000
--- a/target/config/Config.in.endian.choice
+++ /dev/null
@@ -1,34 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice ADK_TARGET_ENDIAN_MODE
-prompt "Endianess"
-depends on ADK_TARGET_ARCH_ARC \
-	|| ADK_TARGET_ARCH_AARCH64 \
-	|| ADK_TARGET_ARCH_ARM \
-	|| ADK_TARGET_ARCH_C6X \
-	|| ADK_TARGET_ARCH_MICROBLAZE \
-	|| ADK_TARGET_ARCH_MIPS \
-	|| ADK_TARGET_ARCH_MIPS64 \
-	|| ADK_TARGET_ARCH_PPC64 \
-	|| ADK_TARGET_ARCH_SH \
-	|| ADK_TARGET_ARCH_XTENSA
-
-config ADK_TARGET_LITTLE_ENDIAN
-	bool "Little endian"
-	depends on !ADK_TARGET_SYSTEM_DRAGINO_MS14S
-	depends on !ADK_TARGET_SYSTEM_LINKSYS_NSLU2
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-
-config ADK_TARGET_BIG_ENDIAN
-	bool "Big endian"
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB532
-	depends on !ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on !ADK_TARGET_SYSTEM_QEMU_ARM
-	depends on !ADK_TARGET_SYSTEM_QEMU_XTENSA
-	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	
-endchoice
diff --git a/target/config/Config.in.endian.default b/target/config/Config.in.endian.default
deleted file mode 100644
index 2ed3be897..000000000
--- a/target/config/Config.in.endian.default
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-config ADK_TARGET_ENDIAN
-	string
-	default "little" if ADK_TARGET_LITTLE_ENDIAN
-	default "big" if ADK_TARGET_BIG_ENDIAN
-
-config ADK_JFFS2_OPTS
-	string
-	default "-l" if ADK_TARGET_LITTLE_ENDIAN
-	default "-b" if ADK_TARGET_BIG_ENDIAN
diff --git a/target/config/Config.in.float b/target/config/Config.in.float
index c193a9f2d..640f2f234 100644
--- a/target/config/Config.in.float
+++ b/target/config/Config.in.float
@@ -1,5 +1,29 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.float.choice
-source target/config/Config.in.float.default
+choice ADK_TARGET_FLOAT_MODE
+prompt "Float configuration"
+depends on ADK_TARGET_ARCH_ARM || \
+	   ADK_TARGET_ARCH_M68K || \
+	   ADK_TARGET_ARCH_MIPS || \
+	   ADK_TARGET_ARCH_PPC
+
+config ADK_TARGET_HARD_FLOAT
+	bool "hard-float"
+	depends on ADK_TARGET_CPU_WITH_FPU
+
+config ADK_TARGET_SOFT_FLOAT
+	bool "soft-float"
+
+config ADK_TARGET_SOFTFP_FLOAT
+	bool "softfp"
+	depends on ADK_TARGET_ARCH_ARM
+
+endchoice
+
+config ADK_TARGET_FLOAT
+	string
+	depends on !ADK_TARGET_ARCH_M68K
+	default "hard" if ADK_TARGET_HARD_FLOAT
+	default "soft" if ADK_TARGET_SOFT_FLOAT
+	default "softfp" if ADK_TARGET_SOFTFP_FLOAT
diff --git a/target/config/Config.in.float.choice b/target/config/Config.in.float.choice
deleted file mode 100644
index 51b8528b4..000000000
--- a/target/config/Config.in.float.choice
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice ADK_TARGET_FLOAT_MODE
-prompt "Float configuration"
-depends on ADK_TARGET_ARCH_ARM || \
-	   ADK_TARGET_ARCH_M68K || \
-	   ADK_TARGET_ARCH_MIPS || \
-	   ADK_TARGET_ARCH_PPC
-
-config ADK_TARGET_HARD_FLOAT
-	bool "hard-float"
-	depends on ADK_TARGET_CPU_WITH_FPU
-
-config ADK_TARGET_SOFT_FLOAT
-	bool "soft-float"
-
-config ADK_TARGET_SOFTFP_FLOAT
-	bool "softfp"
-	depends on ADK_TARGET_ARCH_ARM
-
-endchoice
diff --git a/target/config/Config.in.float.default b/target/config/Config.in.float.default
deleted file mode 100644
index 9a2a7ecb4..000000000
--- a/target/config/Config.in.float.default
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-config ADK_TARGET_FLOAT
-	string
-	depends on !ADK_TARGET_ARCH_M68K
-	default "hard" if ADK_TARGET_HARD_FLOAT
-	default "soft" if ADK_TARGET_SOFT_FLOAT
-	default "softfp" if ADK_TARGET_SOFTFP_FLOAT
diff --git a/target/config/Config.in.fpu b/target/config/Config.in.fpu
index c42d62c0a..0c3acbade 100644
--- a/target/config/Config.in.fpu
+++ b/target/config/Config.in.fpu
@@ -1,5 +1,24 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.fpu.choice
-source target/config/Config.in.fpu.default
+config ADK_TARGET_ARCH_ARM_WITH_NEON
+	bool "enable NEON SIMD support"
+	depends on ADK_TARGET_ARCH_ARM && ADK_TARGET_CPU_WITH_NEON
+	default y
+	help
+	  Enable support for NEON SIMD CPU extensions.
+
+config ADK_TARGET_FPU
+	string
+	depends on ADK_TARGET_ARCH_ARM
+	default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP
+	default "vfpv3-fp16" if ADK_CPU_CORTEX_A5 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "vfpv4" if ADK_CPU_CORTEX_A7 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "vfpv3" if ADK_CPU_CORTEX_A8 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "vfpv3-fp16" if ADK_CPU_CORTEX_A9 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "vfpv4" if ADK_CPU_CORTEX_A15 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon-fp16" if ADK_CPU_CORTEX_A5 && ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon-vfpv4" if ADK_CPU_CORTEX_A7 && ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon" if ADK_CPU_CORTEX_A8 && ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon-fp16" if ADK_CPU_CORTEX_A9 && ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon-vfpv4" if ADK_CPU_CORTEX_A15 && ADK_TARGET_ARCH_ARM_WITH_NEON
diff --git a/target/config/Config.in.fpu.choice b/target/config/Config.in.fpu.choice
deleted file mode 100644
index ace66dc4a..000000000
--- a/target/config/Config.in.fpu.choice
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-config ADK_TARGET_ARCH_ARM_WITH_NEON
-	bool "enable NEON SIMD support"
-	depends on ADK_TARGET_ARCH_ARM && ADK_TARGET_CPU_WITH_NEON
-	default n
-	help
-	  Enable support for NEON SIMD CPU extensions.
diff --git a/target/config/Config.in.fpu.default b/target/config/Config.in.fpu.default
deleted file mode 100644
index 2a2eab4a0..000000000
--- a/target/config/Config.in.fpu.default
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-config ADK_TARGET_FPU
-	string
-	depends on ADK_TARGET_ARCH_ARM
-	default "vfp" if ADK_TARGET_CPU_WITH_FPU_VFP
-	default "vfpv3-fp16" if ADK_CPU_CORTEX_A5 && !ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "vfpv4" if ADK_CPU_CORTEX_A7 && !ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "vfpv3" if ADK_CPU_CORTEX_A8 && !ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "vfpv3-fp16" if ADK_CPU_CORTEX_A9 && !ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "vfpv4" if ADK_CPU_CORTEX_A15 && !ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "neon-fp16" if ADK_CPU_CORTEX_A5 && ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "neon-vfpv4" if ADK_CPU_CORTEX_A7 && ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "neon" if ADK_CPU_CORTEX_A8 && ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "neon-fp16" if ADK_CPU_CORTEX_A9 && ADK_TARGET_ARCH_ARM_WITH_NEON
-	default "neon-vfpv4" if ADK_CPU_CORTEX_A15 && ADK_TARGET_ARCH_ARM_WITH_NEON
diff --git a/target/config/Config.in.gcc b/target/config/Config.in.gcc
index 6e38d9361..2d69f5ed4 100644
--- a/target/config/Config.in.gcc
+++ b/target/config/Config.in.gcc
@@ -1,5 +1,83 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.gcc.choice
-source target/config/Config.in.gcc.default
+choice
+prompt "GCC version"
+default ADK_TOOLCHAIN_GCC_4_2_4 if ADK_TARGET_ARCH_METAG
+default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32
+default ADK_TOOLCHAIN_GCC_4_5_4 if ADK_TARGET_ARCH_BFIN
+default ADK_TOOLCHAIN_GCC_4_7_4 if ADK_TARGET_ARCH_C6X
+default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC
+default ADK_TOOLCHAIN_GCC_4_9_OR1K if ADK_TARGET_ARCH_OR1K
+default ADK_TOOLCHAIN_GCC_4_9_3
+
+config ADK_TOOLCHAIN_GCC_GIT
+	bool "git"
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_OR1K
+	select ADK_DISABLE_HONOUR_CFLAGS
+
+config ADK_TOOLCHAIN_GCC_5_2_0
+	bool "5.2.0"
+	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_C6X
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_OR1K
+
+config ADK_TOOLCHAIN_GCC_4_9_3
+	bool "4.9.3"
+	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_C6X
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_OR1K
+
+config ADK_TOOLCHAIN_GCC_4_8_5
+	bool "4.8.5"
+	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_AARCH64
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_CRIS
+	depends on !ADK_TARGET_ARCH_TILE
+	depends on !ADK_TARGET_ARCH_C6X
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_OR1K
+
+config ADK_TOOLCHAIN_GCC_4_9_OR1K
+	bool "4.9-or1k"
+	depends on ADK_TARGET_ARCH_OR1K
+	select ADK_DISABLE_HONOUR_CFLAGS
+
+config ADK_TOOLCHAIN_GCC_4_8_ARC
+	bool "4.8-arc"
+	depends on ADK_TARGET_ARCH_ARC
+	select ADK_DISABLE_HONOUR_CFLAGS
+
+config ADK_TOOLCHAIN_GCC_4_7_4
+	bool "4.7.4"
+	depends on ADK_TARGET_ARCH_C6X \
+		|| ADK_TARGET_ARCH_SPARC
+
+config ADK_TOOLCHAIN_GCC_4_5_4
+	bool "4.5.4"
+	depends on ADK_TARGET_ARCH_BFIN
+
+config ADK_TOOLCHAIN_GCC_4_4_7
+	bool "4.4.7"
+	depends on ADK_TARGET_ARCH_AVR32
+
+config ADK_TOOLCHAIN_GCC_4_2_4
+	bool "4.2.4"
+	depends on ADK_TARGET_ARCH_METAG
+	select ADK_DISABLE_HONOUR_CFLAGS
+
+endchoice
diff --git a/target/config/Config.in.gcc.choice b/target/config/Config.in.gcc.choice
deleted file mode 100644
index 2d69f5ed4..000000000
--- a/target/config/Config.in.gcc.choice
+++ /dev/null
@@ -1,83 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice
-prompt "GCC version"
-default ADK_TOOLCHAIN_GCC_4_2_4 if ADK_TARGET_ARCH_METAG
-default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32
-default ADK_TOOLCHAIN_GCC_4_5_4 if ADK_TARGET_ARCH_BFIN
-default ADK_TOOLCHAIN_GCC_4_7_4 if ADK_TARGET_ARCH_C6X
-default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC
-default ADK_TOOLCHAIN_GCC_4_9_OR1K if ADK_TARGET_ARCH_OR1K
-default ADK_TOOLCHAIN_GCC_4_9_3
-
-config ADK_TOOLCHAIN_GCC_GIT
-	bool "git"
-	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_METAG
-	depends on !ADK_TARGET_ARCH_OR1K
-	select ADK_DISABLE_HONOUR_CFLAGS
-
-config ADK_TOOLCHAIN_GCC_5_2_0
-	bool "5.2.0"
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_ARCH_METAG
-	depends on !ADK_TARGET_ARCH_OR1K
-
-config ADK_TOOLCHAIN_GCC_4_9_3
-	bool "4.9.3"
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_ARCH_METAG
-	depends on !ADK_TARGET_ARCH_OR1K
-
-config ADK_TOOLCHAIN_GCC_4_8_5
-	bool "4.8.5"
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_AARCH64
-	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_CRIS
-	depends on !ADK_TARGET_ARCH_TILE
-	depends on !ADK_TARGET_ARCH_C6X
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_ARCH_METAG
-	depends on !ADK_TARGET_ARCH_OR1K
-
-config ADK_TOOLCHAIN_GCC_4_9_OR1K
-	bool "4.9-or1k"
-	depends on ADK_TARGET_ARCH_OR1K
-	select ADK_DISABLE_HONOUR_CFLAGS
-
-config ADK_TOOLCHAIN_GCC_4_8_ARC
-	bool "4.8-arc"
-	depends on ADK_TARGET_ARCH_ARC
-	select ADK_DISABLE_HONOUR_CFLAGS
-
-config ADK_TOOLCHAIN_GCC_4_7_4
-	bool "4.7.4"
-	depends on ADK_TARGET_ARCH_C6X \
-		|| ADK_TARGET_ARCH_SPARC
-
-config ADK_TOOLCHAIN_GCC_4_5_4
-	bool "4.5.4"
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TOOLCHAIN_GCC_4_4_7
-	bool "4.4.7"
-	depends on ADK_TARGET_ARCH_AVR32
-
-config ADK_TOOLCHAIN_GCC_4_2_4
-	bool "4.2.4"
-	depends on ADK_TARGET_ARCH_METAG
-	select ADK_DISABLE_HONOUR_CFLAGS
-
-endchoice
diff --git a/target/config/Config.in.gcc.default b/target/config/Config.in.gcc.default
deleted file mode 100644
index 3748dec66..000000000
--- a/target/config/Config.in.gcc.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb
index 5c08273e5..89ae86b7e 100644
--- a/target/config/Config.in.gdb
+++ b/target/config/Config.in.gdb
@@ -1,5 +1,31 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.gdb.choice
-source target/config/Config.in.gdb.default
+choice
+prompt "GNU debugger version"
+default ADK_TOOLCHAIN_GDB_7_10
+
+config ADK_TOOLCHAIN_GDB_GIT
+	bool "git"
+	depends on !ADK_TARGET_ARCH_AVR32
+
+config ADK_TOOLCHAIN_GDB_7_10
+	bool "7.10"
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_H8300
+
+config ADK_TOOLCHAIN_GDB_7_9_1
+	bool "7.9.1"
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_H8300
+
+config ADK_TOOLCHAIN_GDB_7_8_2
+	bool "7.8.2"
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_H8300
+
+config ADK_TOOLCHAIN_GDB_6_7_1
+	bool "6.7.1"
+	depends on ADK_TARGET_ARCH_AVR32
+
+endchoice
diff --git a/target/config/Config.in.gdb.choice b/target/config/Config.in.gdb.choice
deleted file mode 100644
index b05e0202b..000000000
--- a/target/config/Config.in.gdb.choice
+++ /dev/null
@@ -1,28 +0,0 @@
-choice
-prompt "GNU debugger version"
-default ADK_TOOLCHAIN_GDB_7_10
-
-config ADK_TOOLCHAIN_GDB_GIT
-	bool "git"
-	depends on !ADK_TARGET_ARCH_AVR32
-
-config ADK_TOOLCHAIN_GDB_7_10
-	bool "7.10"
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_H8300
-
-config ADK_TOOLCHAIN_GDB_7_9_1
-	bool "7.9.1"
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_H8300
-
-config ADK_TOOLCHAIN_GDB_7_8_2
-	bool "7.8.2"
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_H8300
-
-config ADK_TOOLCHAIN_GDB_6_7_1
-	bool "6.7.1"
-	depends on ADK_TARGET_ARCH_AVR32
-
-endchoice
diff --git a/target/config/Config.in.gdb.default b/target/config/Config.in.gdb.default
deleted file mode 100644
index 3748dec66..000000000
--- a/target/config/Config.in.gdb.default
+++ /dev/null
@@ -1,2 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index e87c1ab67..df13745ed 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -1,6 +1,143 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.kernelversion.choice
-source target/config/Config.in.kernelversion.default
+choice
+prompt "Kernel Version"
+depends on ADK_TARGET_KERNEL_CUSTOMISING
+default ADK_TARGET_KERNEL_VERSION_4_1_10
 
+config ADK_TARGET_KERNEL_VERSION_GIT
+	bool "linux-git"
+	
+config ADK_TARGET_KERNEL_VERSION_4_1_10
+	bool "4.1.10"
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	select ADK_TARGET_KERNEL_VERSION_4_1
+
+config ADK_TARGET_KERNEL_VERSION_3_18_22
+	bool "3.18.22"
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_ARCH_NIOS2
+	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	select ADK_TARGET_KERNEL_VERSION_3_18
+
+config ADK_TARGET_KERNEL_VERSION_3_14_54
+	bool "3.14.54"
+	depends on !ADK_TARGET_ARCH_NIOS2
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	select ADK_TARGET_KERNEL_VERSION_3_14
+
+config ADK_TARGET_KERNEL_VERSION_3_12_48
+	bool "3.12.48"
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
+	depends on !ADK_TARGET_ARCH_NIOS2
+	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	select ADK_TARGET_KERNEL_VERSION_3_12
+
+config ADK_TARGET_KERNEL_VERSION_3_10_90
+	bool "3.10.90"
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_ARCH_NIOS2
+	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	select ADK_TARGET_KERNEL_VERSION_3_10
+
+config ADK_TARGET_KERNEL_VERSION_3_4_109
+	bool "3.4.109"
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
+	depends on !ADK_TARGET_ARCH_NIOS2
+	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	select ADK_TARGET_KERNEL_VERSION_3_4
+
+config ADK_TARGET_KERNEL_VERSION_3_2_71
+	bool "3.2.71"
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
+	depends on !ADK_TARGET_ARCH_NIOS2
+	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	select ADK_TARGET_KERNEL_VERSION_3_2
+
+config ADK_TARGET_KERNEL_VERSION_2_6_32_68
+	bool "2.6.32.68"
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
+	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
+	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
+	depends on !ADK_TARGET_ARCH_NIOS2
+	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
+	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
+	select ADK_TARGET_KERNEL_VERSION_2_6_32
+
+endchoice
+
+config ADK_TARGET_KERNEL_REPO
+	string "git repository"
+	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	default "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
+	help
+	  GIT repository to use.
+
+config ADK_TARGET_KERNEL_HASH
+	string
+	depends on ADK_TARGET_KERNEL_VERSION_GIT
+	help
+	  GIT hash to use.
+
+config ADK_TARGET_KERNEL_VERSION_4_1
+	bool
+
+config ADK_TARGET_KERNEL_VERSION_3_18
+	bool
+
+config ADK_TARGET_KERNEL_VERSION_3_14
+	bool
+
+config ADK_TARGET_KERNEL_VERSION_3_12
+	bool
+
+config ADK_TARGET_KERNEL_VERSION_3_10
+	bool
+
+config ADK_TARGET_KERNEL_VERSION_3_4
+	bool
+
+config ADK_TARGET_KERNEL_VERSION_3_2
+	bool
+
+config ADK_TARGET_KERNEL_VERSION_2_6_32
+	bool
diff --git a/target/config/Config.in.kernelversion.choice b/target/config/Config.in.kernelversion.choice
deleted file mode 100644
index 8533749da..000000000
--- a/target/config/Config.in.kernelversion.choice
+++ /dev/null
@@ -1,119 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice
-prompt "Kernel Version"
-depends on ADK_TARGET_KERNEL_CUSTOMISING
-default ADK_TARGET_KERNEL_VERSION_4_1_10
-
-config ADK_TARGET_KERNEL_VERSION_GIT
-	bool "linux-git"
-	
-config ADK_TARGET_KERNEL_VERSION_4_1_10
-	bool "4.1.10"
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_TARGET_KERNEL_VERSION_4_1
-
-config ADK_TARGET_KERNEL_VERSION_3_18_22
-	bool "3.18.22"
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on !ADK_TARGET_ARCH_NIOS2
-	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
-	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	select ADK_TARGET_KERNEL_VERSION_3_18
-
-config ADK_TARGET_KERNEL_VERSION_3_14_54
-	bool "3.14.54"
-	depends on !ADK_TARGET_ARCH_NIOS2
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	select ADK_TARGET_KERNEL_VERSION_3_14
-
-config ADK_TARGET_KERNEL_VERSION_3_12_48
-	bool "3.12.48"
-	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	depends on !ADK_TARGET_ARCH_NIOS2
-	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	select ADK_TARGET_KERNEL_VERSION_3_12
-
-config ADK_TARGET_KERNEL_VERSION_3_10_90
-	bool "3.10.90"
-	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on !ADK_TARGET_ARCH_NIOS2
-	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	select ADK_TARGET_KERNEL_VERSION_3_10
-
-config ADK_TARGET_KERNEL_VERSION_3_4_109
-	bool "3.4.109"
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	depends on !ADK_TARGET_ARCH_NIOS2
-	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	select ADK_TARGET_KERNEL_VERSION_3_4
-
-config ADK_TARGET_KERNEL_VERSION_3_2_71
-	bool "3.2.71"
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	depends on !ADK_TARGET_ARCH_NIOS2
-	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	select ADK_TARGET_KERNEL_VERSION_3_2
-
-config ADK_TARGET_KERNEL_VERSION_2_6_32_68
-	bool "2.6.32.68"
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI
-	depends on !ADK_TARGET_SYSTEM_RASPBERRY_PI2
-	depends on !ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	depends on !ADK_TARGET_ARCH_NIOS2
-	depends on !ADK_TARGET_SYSTEM_QEMU_SPARC
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	depends on !ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-	select ADK_TARGET_KERNEL_VERSION_2_6_32
-
-endchoice
-
-config ADK_TARGET_KERNEL_REPO
-	string "git repository"
-	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	default "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
-	help
-	  GIT repository to use.
-
-config ADK_TARGET_KERNEL_HASH
-	string
-	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	help
-	  GIT hash to use.
diff --git a/target/config/Config.in.kernelversion.default b/target/config/Config.in.kernelversion.default
deleted file mode 100644
index 6d26d0e16..000000000
--- a/target/config/Config.in.kernelversion.default
+++ /dev/null
@@ -1,40 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-config ADK_TARGET_KERNEL_VERSION_4_1
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_18
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_14
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_12
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_10
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_4
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_3_2
-	bool
-
-config ADK_TARGET_KERNEL_VERSION_2_6_32
-	bool
-
-config ADK_TARGET_KERNEL_VERSION
-	string
-	default "4.1.6" if ADK_TARGET_KERNEL_VERSION_4_1_6
-	default "3.18.16" if ADK_TARGET_KERNEL_VERSION_3_18_16
-	default "3.14.45" if ADK_TARGET_KERNEL_VERSION_3_14_45
-	default "3.12.44" if ADK_TARGET_KERNEL_VERSION_3_12_44
-	default "3.10.81" if ADK_TARGET_KERNEL_VERSION_3_10_81
-	default "3.4.108" if ADK_TARGET_KERNEL_VERSION_3_4_108
-	default "3.2.69" if ADK_TARGET_KERNEL_VERSION_3_2_69
-	default "2.6.32.67" if ADK_TARGET_KERNEL_VERSION_2_6_32_67
-	help
-	  Kernel Version.
-
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index 7e34753df..88ef43ace 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -1,5 +1,179 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.libc.choice
-source target/config/Config.in.libc.default
+choice
+prompt "C library"
+
+config ADK_TARGET_LIB_UCLIBC_NG
+	bool "uClibc-ng embedded C library"
+	depends on \
+		   !ADK_TARGET_ARCH_AARCH64 && \
+		   !ADK_TARGET_ARCH_HPPA && \
+		   !ADK_TARGET_ARCH_NIOS2 && \
+		   !ADK_TARGET_ARCH_SPARC64 && \
+		   !ADK_TARGET_ARCH_PPC64 && \
+		   !ADK_TARGET_ARCH_TILE
+	help
+	  http://uclibc-ng.org
+
+config ADK_TARGET_LIB_MUSL
+	bool "musl C library"
+	depends on !ADK_TARGET_UCLINUX
+	depends on \
+		ADK_TARGET_ARCH_AARCH64 || \
+		ADK_TARGET_ARCH_ARM || \
+		ADK_TARGET_ARCH_MICROBLAZE || \
+		ADK_TARGET_ARCH_MIPS || \
+		ADK_TARGET_ARCH_OR1K || \
+		ADK_TARGET_ARCH_PPC || \
+		ADK_TARGET_ARCH_SH || \
+		ADK_TARGET_ARCH_X86 || \
+		ADK_TARGET_ARCH_X86_64
+	help
+ 	  http://musl-libc.org
+
+config ADK_TARGET_LIB_GLIBC
+	bool "GNU C library"
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_BFIN
+	depends on !ADK_TARGET_ARCH_CRIS
+	depends on !ADK_TARGET_ARCH_H8300
+	depends on !ADK_TARGET_ARCH_OR1K
+	depends on !ADK_TARGET_ARCH_XTENSA
+	depends on !ADK_TARGET_UCLINUX
+	depends on !ADK_TARGET_WITHOUT_MMU
+	help
+	  http://www.gnu.org/libc
+
+endchoice
+
+choice
+prompt "C library version"
+
+config ADK_TARGET_LIB_UCLIBC_NG_1_0_7
+	bool "1.0.7"
+	depends on ADK_TARGET_LIB_UCLIBC_NG
+
+config ADK_TARGET_LIB_UCLIBC_NG_1_0_6
+	bool "1.0.6"
+	depends on ADK_TARGET_LIB_UCLIBC_NG
+
+config ADK_TARGET_LIB_UCLIBC_NG_1_0_5
+	bool "1.0.5"
+	depends on ADK_TARGET_LIB_UCLIBC_NG
+
+config ADK_TARGET_LIB_UCLIBC_NG_GIT
+	bool "git"
+	depends on ADK_TARGET_LIB_UCLIBC_NG
+
+config ADK_TARGET_LIB_GLIBC_2_22
+	bool "2.22"
+	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
+
+config ADK_TARGET_LIB_GLIBC_2_21
+	bool "2.21"
+	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
+
+config ADK_TARGET_LIB_GLIBC_2_20
+	bool "2.20"
+	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
+
+config ADK_TARGET_LIB_GLIBC_GIT
+	bool "git"
+	depends on ADK_TARGET_LIB_GLIBC
+
+config ADK_TARGET_LIB_MUSL_1_1_12
+	bool "1.1.12"
+	depends on ADK_TARGET_LIB_MUSL
+
+config ADK_TARGET_LIB_MUSL_1_1_11
+	bool "1.1.11"
+	depends on ADK_TARGET_LIB_MUSL
+
+config ADK_TARGET_LIB_MUSL_1_1_10
+	bool "1.1.10"
+	depends on ADK_TARGET_LIB_MUSL
+
+config ADK_TARGET_LIB_MUSL_GIT
+	bool "git"
+	depends on ADK_TARGET_LIB_MUSL
+
+endchoice
+
+choice
+prompt "Threading"
+depends on ADK_TARGET_LIB_UCLIBC_NG && !ADK_TARGET_WITHOUT_THREADS
+
+config ADK_TARGET_LIB_WITH_THREADS
+	bool "enable threads"
+
+config ADK_TARGET_LIB_WITHOUT_THREADS
+	bool "disable threads"
+
+endchoice
+
+config ADK_TARGET_WITH_LT
+	bool
+
+config ADK_TARGET_WITH_NPTL
+	bool
+
+config ADK_TARGET_WITHOUT_THREADS
+	bool
+
+config ADK_TARGET_WITHOUT_CXX
+	bool
+
+config ADK_TARGET_LIBC
+	string
+	default "uclibc-ng" if ADK_TARGET_LIB_UCLIBC_NG
+	default "glibc" if ADK_TARGET_LIB_GLIBC
+	default "musl" if ADK_TARGET_LIB_MUSL
+
+config ADK_LIBC_VERSION
+	string
+	default "1.0.7" if ADK_TARGET_LIB_UCLIBC_NG_1_0_7
+	default "1.0.6" if ADK_TARGET_LIB_UCLIBC_NG_1_0_6
+	default "1.0.5" if ADK_TARGET_LIB_UCLIBC_NG_1_0_5
+	default "1.1.12" if ADK_TARGET_LIB_MUSL_1_1_12
+	default "1.1.11" if ADK_TARGET_LIB_MUSL_1_1_11
+	default "1.1.10" if ADK_TARGET_LIB_MUSL_1_1_10
+	default "2.22" if ADK_TARGET_LIB_GLIBC_2_22
+	default "2.21" if ADK_TARGET_LIB_GLIBC_2_21
+	default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
+	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
+		         ADK_TARGET_LIB_MUSL_GIT || \
+		         ADK_TARGET_LIB_GLIBC_GIT
+
+config ADK_TARGET_LIB_UCLIBC_NG_1_0
+	bool
+	default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_7
+	default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_6
+	default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_5
+
+config ADK_TARGET_SUFFIX
+	string
+	default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
+	default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_ARM
+	default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_N64
+	default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_N32
+	default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_O64
+	default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_32 && ADK_LINUX_64
+	default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_X32 && ADK_LINUX_64
+	default "gnu" if ADK_TARGET_LIB_GLIBC
+	default "uclibceabihf" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
+	default "uclibceabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM
+	default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_N64
+	default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_N32
+	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_O32
+	default "uclibc32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_32 && ADK_LINUX_64
+	default "uclibc" if ADK_TARGET_LIB_UCLIBC_NG
+	default "musleabihf" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
+	default "musleabi" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_ARM
+	default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_N64
+	default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_N32
+	default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_O32
+	default "musl32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_32 && ADK_LINUX_64
+	default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_X32 && ADK_LINUX_64
+	default "musl" if ADK_TARGET_LIB_MUSL
diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice
deleted file mode 100644
index 3e4b20f68..000000000
--- a/target/config/Config.in.libc.choice
+++ /dev/null
@@ -1,114 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice
-prompt "C library"
-
-config ADK_TARGET_LIB_UCLIBC_NG
-	bool "uClibc-ng embedded C library"
-	depends on \
-		   !ADK_TARGET_ARCH_AARCH64 && \
-		   !ADK_TARGET_ARCH_HPPA && \
-		   !ADK_TARGET_ARCH_NIOS2 && \
-		   !ADK_TARGET_ARCH_SPARC64 && \
-		   !ADK_TARGET_ARCH_PPC64 && \
-		   !ADK_TARGET_ARCH_TILE
-	help
-	  http://uclibc-ng.org
-
-config ADK_TARGET_LIB_MUSL
-	bool "musl C library"
-	depends on !ADK_TARGET_UCLINUX
-	depends on \
-		ADK_TARGET_ARCH_AARCH64 || \
-		ADK_TARGET_ARCH_ARM || \
-		ADK_TARGET_ARCH_MICROBLAZE || \
-		ADK_TARGET_ARCH_MIPS || \
-		ADK_TARGET_ARCH_OR1K || \
-		ADK_TARGET_ARCH_PPC || \
-		ADK_TARGET_ARCH_SH || \
-		ADK_TARGET_ARCH_X86 || \
-		ADK_TARGET_ARCH_X86_64
-	help
- 	  http://musl-libc.org
-
-config ADK_TARGET_LIB_GLIBC
-	bool "GNU C library"
-	depends on !ADK_TARGET_ARCH_ARC
-	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_TARGET_ARCH_BFIN
-	depends on !ADK_TARGET_ARCH_CRIS
-	depends on !ADK_TARGET_ARCH_H8300
-	depends on !ADK_TARGET_ARCH_OR1K
-	depends on !ADK_TARGET_ARCH_XTENSA
-	depends on !ADK_TARGET_UCLINUX
-	depends on !ADK_TARGET_WITHOUT_MMU
-	help
-	  http://www.gnu.org/libc
-
-endchoice
-
-choice
-prompt "C library version"
-
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_7
-	bool "1.0.7"
-	depends on ADK_TARGET_LIB_UCLIBC_NG
-
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_6
-	bool "1.0.6"
-	depends on ADK_TARGET_LIB_UCLIBC_NG
-
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_5
-	bool "1.0.5"
-	depends on ADK_TARGET_LIB_UCLIBC_NG
-
-config ADK_TARGET_LIB_UCLIBC_NG_GIT
-	bool "git"
-	depends on ADK_TARGET_LIB_UCLIBC_NG
-
-config ADK_TARGET_LIB_GLIBC_2_22
-	bool "2.22"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
-
-config ADK_TARGET_LIB_GLIBC_2_21
-	bool "2.21"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
-
-config ADK_TARGET_LIB_GLIBC_2_20
-	bool "2.20"
-	depends on ADK_TARGET_LIB_GLIBC && !ADK_TARGET_ARCH_HPPA
-
-config ADK_TARGET_LIB_GLIBC_GIT
-	bool "git"
-	depends on ADK_TARGET_LIB_GLIBC
-
-config ADK_TARGET_LIB_MUSL_1_1_12
-	bool "1.1.12"
-	depends on ADK_TARGET_LIB_MUSL
-
-config ADK_TARGET_LIB_MUSL_1_1_11
-	bool "1.1.11"
-	depends on ADK_TARGET_LIB_MUSL
-
-config ADK_TARGET_LIB_MUSL_1_1_10
-	bool "1.1.10"
-	depends on ADK_TARGET_LIB_MUSL
-
-config ADK_TARGET_LIB_MUSL_GIT
-	bool "git"
-	depends on ADK_TARGET_LIB_MUSL
-
-endchoice
-
-choice
-prompt "Threading"
-depends on ADK_TARGET_LIB_UCLIBC_NG && !ADK_TARGET_WITHOUT_THREADS
-
-config ADK_TARGET_LIB_WITH_THREADS
-	bool "enable threads"
-
-config ADK_TARGET_LIB_WITHOUT_THREADS
-	bool "disable threads"
-
-endchoice
diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default
deleted file mode 100644
index 0036a0d67..000000000
--- a/target/config/Config.in.libc.default
+++ /dev/null
@@ -1,67 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-config ADK_TARGET_WITH_LT
-	bool
-
-config ADK_TARGET_WITH_NPTL
-	bool
-
-config ADK_TARGET_WITHOUT_THREADS
-	bool
-
-config ADK_TARGET_WITHOUT_CXX
-	bool
-
-config ADK_TARGET_LIBC
-	string
-	default "uclibc-ng" if ADK_TARGET_LIB_UCLIBC_NG
-	default "glibc" if ADK_TARGET_LIB_GLIBC
-	default "musl" if ADK_TARGET_LIB_MUSL
-
-config ADK_LIBC_VERSION
-	string
-	default "1.0.7" if ADK_TARGET_LIB_UCLIBC_NG_1_0_7
-	default "1.0.6" if ADK_TARGET_LIB_UCLIBC_NG_1_0_6
-	default "1.0.5" if ADK_TARGET_LIB_UCLIBC_NG_1_0_5
-	default "1.1.12" if ADK_TARGET_LIB_MUSL_1_1_12
-	default "1.1.11" if ADK_TARGET_LIB_MUSL_1_1_11
-	default "1.1.10" if ADK_TARGET_LIB_MUSL_1_1_10
-	default "2.22" if ADK_TARGET_LIB_GLIBC_2_22
-	default "2.21" if ADK_TARGET_LIB_GLIBC_2_21
-	default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
-	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
-		         ADK_TARGET_LIB_MUSL_GIT || \
-		         ADK_TARGET_LIB_GLIBC_GIT
-
-config ADK_TARGET_LIB_UCLIBC_NG_1_0
-	bool
-	default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_7
-	default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_6
-	default y if ADK_TARGET_LIB_UCLIBC_NG_1_0_5
-
-config ADK_TARGET_SUFFIX
-	string
-	default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
-	default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_ARM
-	default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_N64
-	default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_N32
-	default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_O64
-	default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_32 && ADK_LINUX_64
-	default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ABI_X32 && ADK_LINUX_64
-	default "gnu" if ADK_TARGET_LIB_GLIBC
-	default "uclibceabihf" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
-	default "uclibceabi" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ARCH_ARM
-	default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_N64
-	default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_N32
-	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_O32
-	default "uclibc32" if ADK_TARGET_LIB_UCLIBC_NG && ADK_TARGET_ABI_32 && ADK_LINUX_64
-	default "uclibc" if ADK_TARGET_LIB_UCLIBC_NG
-	default "musleabihf" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_ARM && ADK_TARGET_HARD_FLOAT
-	default "musleabi" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ARCH_ARM
-	default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_N64
-	default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_N32
-	default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_O32
-	default "musl32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_32 && ADK_LINUX_64
-	default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_TARGET_ABI_X32 && ADK_LINUX_64
-	default "musl" if ADK_TARGET_LIB_MUSL
diff --git a/target/config/Config.in.mips b/target/config/Config.in.mips
index 161a7f127..7fb09ec3c 100644
--- a/target/config/Config.in.mips
+++ b/target/config/Config.in.mips
@@ -1,5 +1,16 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.mips.choice
-source target/config/Config.in.mips.default
+choice ADK_TARGET_MIPS_CPU_ARCH
+prompt "ISA configuration"
+depends on ADK_TARGET_ARCH_MIPS
+
+config ADK_CPU_MIPS_MIPS32
+        bool "MIPS32"
+        select ADK_CPU_MIPS32
+
+config ADK_CPU_MIPS_MIPS32R2
+        bool "MIPS32r2"
+        select ADK_CPU_MIPS32R2
+
+endchoice
diff --git a/target/config/Config.in.mips.choice b/target/config/Config.in.mips.choice
deleted file mode 100644
index 7fb09ec3c..000000000
--- a/target/config/Config.in.mips.choice
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice ADK_TARGET_MIPS_CPU_ARCH
-prompt "ISA configuration"
-depends on ADK_TARGET_ARCH_MIPS
-
-config ADK_CPU_MIPS_MIPS32
-        bool "MIPS32"
-        select ADK_CPU_MIPS32
-
-config ADK_CPU_MIPS_MIPS32R2
-        bool "MIPS32r2"
-        select ADK_CPU_MIPS32R2
-
-endchoice
diff --git a/target/config/Config.in.mips.default b/target/config/Config.in.mips.default
deleted file mode 100644
index 43df6220c..000000000
--- a/target/config/Config.in.mips.default
+++ /dev/null
@@ -1,3 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
diff --git a/target/config/Config.in.xtensa b/target/config/Config.in.xtensa
index f322fc7c8..0b831bff5 100644
--- a/target/config/Config.in.xtensa
+++ b/target/config/Config.in.xtensa
@@ -1,5 +1,24 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-source target/config/Config.in.xtensa.choice
-source target/config/Config.in.xtensa.default
+choice ADK_TARGET_XTENSA_VARIANT
+prompt "CPU variant"
+depends on ADK_TARGET_ARCH_XTENSA
+
+config ADK_TARGET_XTENSA_DC233C
+	bool "dc233c"
+	select ADK_KERNEL_XTENSA_VARIANT_DC233C
+	select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
+	select ADK_TARGET_LITTLE_ENDIAN
+
+config ADK_TARGET_XTENSA_DC232B
+	bool "dc232b"
+	select ADK_KERNEL_XTENSA_VARIANT_DC232B
+	select ADK_TARGET_LITTLE_ENDIAN
+
+endchoice
+
+config ADK_TARGET_XTENSA
+	string
+	default "dc233c" if ADK_TARGET_XTENSA_DC233C
+	default "dc232b" if ADK_TARGET_XTENSA_DC232B
diff --git a/target/config/Config.in.xtensa.choice b/target/config/Config.in.xtensa.choice
deleted file mode 100644
index f5c78f90f..000000000
--- a/target/config/Config.in.xtensa.choice
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-choice ADK_TARGET_XTENSA_VARIANT
-prompt "CPU variant"
-depends on ADK_TARGET_ARCH_XTENSA
-
-config ADK_TARGET_XTENSA_DC233C
-	bool "dc233c"
-	select ADK_KERNEL_XTENSA_VARIANT_DC233C
-	select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
-	select ADK_TARGET_LITTLE_ENDIAN
-
-config ADK_TARGET_XTENSA_DC232B
-	bool "dc232b"
-	select ADK_KERNEL_XTENSA_VARIANT_DC232B
-	select ADK_TARGET_LITTLE_ENDIAN
-
-endchoice
diff --git a/target/config/Config.in.xtensa.default b/target/config/Config.in.xtensa.default
deleted file mode 100644
index 56c39c009..000000000
--- a/target/config/Config.in.xtensa.default
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-config ADK_TARGET_XTENSA
-	string
-	default "dc233c" if ADK_TARGET_XTENSA_DC233C
-	default "dc232b" if ADK_TARGET_XTENSA_DC232B