20 files changed, 1279 insertions, 1821 deletions
diff --git a/target/config/Config.in b/target/config/Config.in
index 5e6680d2d..c584b9e55 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -8,10 +8,7 @@ config ADK_LINUX_64
 config ADK_TARGET_KERNEL_64
 	bool
 
-config ADK_TOOLCHAIN_ONLY
-	bool
-
-config ADK_TARGET_TOOLCHAIN
+config ADK_TARGET_GENERIC
 	bool
 
 config ADK_TARGET_UCLINUX
@@ -32,12 +29,6 @@ config ADK_TARGET_VBOX
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
 
-config ADK_TARGET_ARCH_ARM_WITH_THUMB
-	bool
-	select ADK_KERNEL_ARM_THUMB
-	select ADK_KERNEL_THUMB2_KERNEL
-	depends on ADK_TARGET_ARCH_ARM
-
 # the inverse of ADK_TARGET_KERNEL_CUSTOMISING,
 # allows for selecting it off (i.e., to disable it)
 config ADK_TARGET_FIXED_KERNEL
diff --git a/target/config/Config.in.adk b/target/config/Config.in.adk
index 81144dc02..a70752bab 100644
--- a/target/config/Config.in.adk
+++ b/target/config/Config.in.adk
@@ -1,17 +1,16 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-menu "Global ADK settings"
-	visible if !ADK_CHOOSE_APPLIANCE
+menu "Global settings"
 
 config ADK_HOST
 	string "webserver for packages and distfiles"
 	default "openadk.org"
 	help
-	  Configure host for IPKG package management.
+	  Configure host for package management and backup server for distfiles.
 
 config ADK_DL_DIR
-	string "download directory for packages"
+	string "download directory for source packages"
 	default ""
 	help
 	  Configure the download directory for all source packages.
@@ -30,7 +29,7 @@ config ADK_BUILD_WITH_DEBUG
 	default n
 	help
 	  If you want to create debug packages, you should enable this option.
-	  WARNING: It will use a lot of aditional disk space on you build system!
+	  WARNING: It will use a lot of additional disk space on you build system!
 
 config ADK_DISABLE_HONOUR_CFLAGS
 	bool "Disable honour CFLAGS checks globally"
@@ -46,6 +45,7 @@ config ADK_DISABLE_CHECKSUM
 
 config ADK_DISABLE_KERNEL_PATCHES
 	bool "Disable global kernel patches"
+	depends on ADK_TARGET_OS_LINUX
 	default n
 	help
 	  Disable all global kernel patches.
@@ -54,6 +54,7 @@ config ADK_DISABLE_KERNEL_PATCHES
 
 config ADK_DISABLE_TARGET_KERNEL_PATCHES
 	bool "Disable target specific kernel patches"
+	depends on ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN
 	default n
 	help
 	  Disable all target specific kernel patches.
@@ -64,7 +65,7 @@ config ADK_WGET_TIMEOUT
 	int "Set wget timeout"
 	default 10
 	help
-	  set wget timeout	
+	  Set wget timeout	
 
 config ADK_USE_CCACHE
 	bool "Use ccache to speedup recompilation"
@@ -78,7 +79,7 @@ config ADK_MAKE_JOBS
 	default 1 if ! ADK_MAKE_PARALLEL
 
 config ADK_MAKE_PARALLEL
-	bool "Enable parallel building of packages"
+	bool "Enable parallel building"
 	default y
 
 config ADK_MAKE_JOBS
@@ -101,15 +102,4 @@ config ADK_TARGET_PORT
 	help
 	  Port to use for SSH when running make check.
 
-config ADK_PRELINK
-	prompt "Prelink binaries and libraries in Image"
-	boolean
-	help
-	  Do prelinking for faster loading of binaries.
-
-config ADK_PRELINK_OPTS
-	string "additional options to pass to prelink"
-	default "-mR"
-	depends on ADK_PRELINK
-
 endmenu
diff --git a/target/config/Config.in.archopts b/target/config/Config.in.archopts
new file mode 100644
index 000000000..03de1768b
--- /dev/null
+++ b/target/config/Config.in.archopts
@@ -0,0 +1,9 @@
+# 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_THUMB
+       bool
+       select ADK_KERNEL_ARM_THUMB
+       select ADK_KERNEL_THUMB2_KERNEL
+       depends on ADK_TARGET_ARCH_ARM
+
diff --git a/target/config/Config.in.binfmt b/target/config/Config.in.binfmt
index 1ed595afc..76aebe706 100644
--- a/target/config/Config.in.binfmt
+++ b/target/config/Config.in.binfmt
@@ -3,6 +3,7 @@
 
 choice
 prompt "Binary Format"
+depends on ADK_TARGET_OS_LINUX
 
 config ADK_TARGET_BINFMT_ELF
 	bool "ELF"
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index 81d1546d7..d0dff461b 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -21,7 +21,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_26
 	bool "2.26"
 	depends on !ADK_TARGET_ARCH_ARC
 	depends on !ADK_TARGET_ARCH_AVR32
-	depends on !ADK_CPU_CRIS_V10
+	depends on !ADK_TARGET_CPU_CRIS_CRISV10
 
 config ADK_TOOLCHAIN_BINUTILS_2_25_1
 	bool "2.25.1"
@@ -30,7 +30,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_25_1
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_H8300
 	depends on !ADK_TARGET_ARCH_MOXIE
-	depends on !ADK_CPU_CRIS_V10
+	depends on !ADK_TARGET_CPU_CRIS_CRISV10
 
 config ADK_TOOLCHAIN_BINUTILS_2_24
 	bool "2.24"
@@ -47,7 +47,7 @@ config ADK_TOOLCHAIN_BINUTILS_2_23_ARC
 
 config ADK_TOOLCHAIN_BINUTILS_2_22
 	bool "2.22"
-	depends on ADK_CPU_CRIS_V10
+	depends on ADK_TARGET_CPU_CRIS_CRISV10
 
 config ADK_TOOLCHAIN_BINUTILS_2_20_1
 	bool "2.20.1"
diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu
index e8ebcf8bb..17f3e0df0 100644
--- a/target/config/Config.in.cpu
+++ b/target/config/Config.in.cpu
@@ -1,950 +1,1073 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
-# CPU
-config ADK_CPU_ALPHA
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_WITHOUT_THREADS if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
-
-config ADK_CPU_AMD_BOBCAT
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-
-config ADK_CPU_AMDFAM10
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-
-config ADK_CPU_ATHLON_FX
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_3DNOW
-	select ADK_TARGET_CPU_WITH_3DNOWEXT
-
-config ADK_CPU_ATHLON_64
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_3DNOW
-	select ADK_TARGET_CPU_WITH_3DNOWEXT
-
-config ADK_CPU_ATHLON_64_SSE3
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_3DNOW
-	select ADK_TARGET_CPU_WITH_3DNOWEXT
-
-config ADK_CPU_BARCELONA
-	bool
+choice ADK_TARGET_CPU
+prompt "CPU" if ADK_TARGET_GENERIC || \
+		ADK_TARGET_SYSTEM_QEMU_MIPS || \
+		ADK_TARGET_SYSTEM_QEMU_MIPS64 || \
+		ADK_TARGET_SYSTEM_QEMU_XTENSA
+
+# aarch64
+config ADK_TARGET_CPU_AARCH64_CORTEX_A53
+        bool "cortex-a53"
 	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4A
-	select ADK_TARGET_CPU_WITH_3DNOW
-	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_AARCH64
 
-config ADK_CPU_BDVER1
-	bool
+config ADK_TARGET_CPU_AARCH64_CORTEX_A57
+        bool "cortex-a57"
 	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4A
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_AARCH64
 
-config ADK_CPU_BDVER2
-	bool
+# alpha
+config ADK_TARGET_CPU_ALPHA
+	bool "alpha"
 	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4A
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
-
-config ADK_CPU_BDVER3
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4A
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
-
-config ADK_CPU_BDVER4
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4A
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
-
-config ADK_CPU_BONNELL
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSSE3
-
-config ADK_CPU_BROADWELL
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSSE3
-
-config ADK_CPU_BTVER1
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4A
-	select ADK_TARGET_CPU_WITH_SSSE3
-
-config ADK_CPU_BTVER2
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4A
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
-
-config ADK_CPU_CORE2
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSSE3
-
-config ADK_CPU_HASWELL
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
-	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITHOUT_THREADS if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
+	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
+	depends on ADK_TARGET_ARCH_ALPHA
 
-config ADK_CPU_IVYBRIDGE
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
+# arc
+config ADK_TARGET_CPU_ARC_ARC700
+	bool "ARC700 (ARCv1)"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_ARC
 
-config ADK_CPU_K8
-	bool
-	select ADK_LINUX_64
+config ADK_TARGET_CPU_ARC_ARC_HS
+	bool "ARC HS (ARCv2)"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_3DNOW
-	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_ARC
 
-config ADK_CPU_K8_SSE3
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
+# arm
+config ADK_TARGET_CPU_ARM_ARM1176JZF_S
+        bool "arm1176jzf-s"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_3DNOW
-	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	select ADK_TARGET_CPU_WITH_FPU_VFP
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_KNL
-	bool
-	select ADK_LINUX_64
+config ADK_TARGET_CPU_ARM_ARM926EJ_S
+        bool "arm926ej-s"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_NEHALEM
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
+config ADK_TARGET_CPU_ARM_ARM11MPCORE
+	bool "arm11mpcore"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_SSE3
-	select ADK_TARGET_CPU_WITH_SSE4_1
-	select ADK_TARGET_CPU_WITH_SSE4_2
-	select ADK_TARGET_CPU_WITH_SSSE3
+	select ADK_TARGET_CPU_WITH_FPU_VFPV3
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_NOCONA
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
+config ADK_TARGET_CPU_ARM_CORTEX_A5
+        bool "cortex-a5"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_FPU_VFPV3
+	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_ARC700
-	bool
+config ADK_TARGET_CPU_ARM_CORTEX_A7
+        bool "cortex-a7"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_FPU_VFPV4
+	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_ARC_HS
-	bool
+config ADK_TARGET_CPU_ARM_CORTEX_A8
+        bool "cortex-a8"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_FPU_VFPV3
+	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_ARM11MPCORE
-	bool
+config ADK_TARGET_CPU_ARM_CORTEX_A9
+        bool "cortex-a9"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_CPU_WITH_FPU_VFPV3
+	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_ARM1176JZF_S
-	bool
+config ADK_TARGET_CPU_ARM_CORTEX_A15
+        bool "cortex-a15"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFP
+	select ADK_TARGET_CPU_WITH_FPU_VFPV4
+	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_ARM926EJ_S
-	bool
+config ADK_TARGET_CPU_ARM_CORTEX_A17
+        bool "cortex-a17"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_FPU_VFPV4
+	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_ARMV8
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
+config ADK_TARGET_CPU_ARM_CORTEX_M4
+	bool "cortex-m4"
+	select ADK_TARGET_UCLINUX
+	select ADK_TARGET_WITH_LT
+	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_ARCH_ARM_WITH_THUMB
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_ATHLON
-	bool
-	select ADK_LINUX_64
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
+config ADK_TARGET_CPU_ARM_CORTEX_M3
+	bool "cortex-m3"
+	select ADK_TARGET_UCLINUX
+	select ADK_TARGET_WITH_LT
+	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_ARCH_ARM_WITH_THUMB
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_ATOM
-	bool
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
+config ADK_TARGET_CPU_ARM_XSCALE
+        bool "xscale"
+	depends on ADK_TARGET_ARCH_ARM
 
-config ADK_CPU_AVR32
-	bool
+# avr32
+config ADK_TARGET_CPU_AVR32
+	bool "avr32"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_AVR32
 
-config ADK_CPU_BFIN
-	bool
+# bfin
+config ADK_TARGET_CPU_BFIN_BF512
+        bool "bf512"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF512
-	bool
+config ADK_TARGET_CPU_BFIN_BF514
+        bool "bf514"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF514
-	bool
+config ADK_TARGET_CPU_BFIN_BF516
+        bool "bf516"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF516
-	bool
+config ADK_TARGET_CPU_BFIN_BF518
+        bool "bf518"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF518
-	bool
+config ADK_TARGET_CPU_BFIN_BF522
+        bool "bf522"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF522
-	bool
+config ADK_TARGET_CPU_BFIN_BF523
+        bool "bf523"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF523
-	bool
+config ADK_TARGET_CPU_BFIN_BF524
+        bool "bf524"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF524
-	bool
+config ADK_TARGET_CPU_BFIN_BF525
+        bool "bf525"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF525
-	bool
+config ADK_TARGET_CPU_BFIN_BF526
+        bool "bf526"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF526
-	bool
+config ADK_TARGET_CPU_BFIN_BF527
+        bool "bf527"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF527
-	bool
+config ADK_TARGET_CPU_BFIN_BF531
+        bool "bf531"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF531
-	bool
+config ADK_TARGET_CPU_BFIN_BF532
+        bool "bf532"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF532
-	bool
+config ADK_TARGET_CPU_BFIN_BF533
+        bool "bf533"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF533
-	bool
+config ADK_TARGET_CPU_BFIN_BF534
+        bool "bf534"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF534
-	bool
+config ADK_TARGET_CPU_BFIN_BF536
+        bool "bf536"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF536
-	bool
+config ADK_TARGET_CPU_BFIN_BF537
+        bool "bf537"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF537
-	bool
+config ADK_TARGET_CPU_BFIN_BF538
+        bool "bf538"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF538
-	bool
+config ADK_TARGET_CPU_BFIN_BF539
+        bool "bf539"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF539
-	bool
+config ADK_TARGET_CPU_BFIN_BF542
+        bool "bf542"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF542
-	bool
+config ADK_TARGET_CPU_BFIN_BF544
+        bool "bf544"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF544
-	bool
+config ADK_TARGET_CPU_BFIN_BF547
+        bool "bf547"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF547
-	bool
+config ADK_TARGET_CPU_BFIN_BF548
+        bool "bf548"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF548
-	bool
+config ADK_TARGET_CPU_BFIN_BF549
+        bool "bf549"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF549
-	bool
+config ADK_TARGET_CPU_BFIN_BF542M
+        bool "bf542m"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF542M
-	bool
+config ADK_TARGET_CPU_BFIN_BF544M
+        bool "bf544m"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF544M
-	bool
+config ADK_TARGET_CPU_BFIN_BF547M
+        bool "bf547m"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF547M
-	bool
+config ADK_TARGET_CPU_BFIN_BF548M
+        bool "bf548m"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF548M
-	bool
+config ADK_TARGET_CPU_BFIN_BF549M
+        bool "bf549m"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF549M
-	bool
+config ADK_TARGET_CPU_BFIN_BF561
+        bool "bf561"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF561
-	bool
+config ADK_TARGET_CPU_BFIN_BF592
+        bool "bf592"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_BFIN
 
-config ADK_CPU_BF592
-	bool
+# c6x
+config ADK_TARGET_CPU_C6X
+	bool "c6x"
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_C6X
 
-config ADK_CPU_C6X
-	bool
+# cris
+config ADK_TARGET_CPU_CRIS_CRISV10
+	bool "crisv10"
+	select ADK_TARGET_WITH_LT
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_CRIS
+
+config ADK_TARGET_CPU_CRIS_CRISV32
+	bool "crisv32"
 	select ADK_TARGET_WITH_LT
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_CRIS
+
+# fr-v
+config ADK_TARGET_CPU_FRV
+	bool "fr-v"
 	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_WITHOUT_THREADS
+	select ADK_TARGET_WITHOUT_CXX
+	depends on ADK_TARGET_ARCH_FRV
 
-config ADK_CPU_CF
-	bool
+# h8/300
+config ADK_TARGET_CPU_H8300
+	bool "h8/300"
+	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_WITHOUT_THREADS
+	select ADK_TARGET_WITHOUT_CXX
+	depends on ADK_TARGET_ARCH_H8300
 
-config ADK_CPU_CF_51
-	bool
-	select ADK_CPU_CF
+# hppa
+config ADK_TARGET_CPU_PARISC
+	bool "parisc"
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
+	depends on ADK_TARGET_ARCH_HPPA
+
+# ia64
+config ADK_TARGET_CPU_IA64
+	bool "ia64"
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
+	depends on ADK_TARGET_ARCH_IA64
+
+# lm32
+config ADK_TARGET_CPU_LM32
+	bool "lm32"
+	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_WITHOUT_THREADS
+	depends on ADK_TARGET_ARCH_LM32
+
+# coldfire
+config ADK_TARGET_CPU_CF_51
+	bool "coldfire 51"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5206
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5206
+	bool "coldfire 5206"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5206E
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5206E
+	bool "coldfire 5206e"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5208
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5208
+	bool "coldfire 5208"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5211A
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5211A
+	bool "coldfire 5211a"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5213
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5213
+	bool "coldfire 5213"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5216
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5216
+	bool "coldfire 5216"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_52235
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_52235
+	bool "coldfire 52235"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5225
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5225
+	bool "coldfire 5225"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_52259
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_52259
+	bool "coldfire 52259"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5235
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5235
+	bool "coldfire 5235"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5249
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5249
+	bool "coldfire 5249"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5250
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5250
+	bool "coldfire 5250"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5271
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5271
+	bool "coldfire 5271"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5272
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5272
+	bool "coldfire 5272"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5275
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5275
+	bool "coldfire 5275"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5282
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5282
+	bool "coldfire 5282"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_53017
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_53017
+	bool "coldfire 53017"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5307
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5307
+	bool "coldfire 5307"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5328
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5328
+	bool "coldfire 5328"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5329
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5329
+	bool "coldfire 5329"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5373
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5373
+	bool "coldfire 5373"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5407
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5407
+	bool "coldfire 5407"
+	select ADK_TARGET_CPU_CF
+	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITHOUT_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CF_5475
-	bool
-	select ADK_CPU_CF
+config ADK_TARGET_CPU_CF_5475
+	bool "coldfire 5475"
+	select ADK_TARGET_CPU_CF
 	select ADK_TARGET_WITH_LT
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CORTEX_M3
-	bool
-	select ADK_TARGET_WITH_LT
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_ARCH_ARM_WITH_THUMB
+# m68k
+config ADK_TARGET_CPU_M68K_68020
+	bool "68020"
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CORTEX_M4
-	bool
-	select ADK_TARGET_WITH_LT
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_ARCH_ARM_WITH_THUMB
+config ADK_TARGET_CPU_M68K_68030
+	bool "68030"
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+	depends on ADK_TARGET_ARCH_M68K
 
-config ADK_CPU_CORTEX_A5
-	bool
+config ADK_TARGET_CPU_M68K_68040
+	bool "68040"
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_M68K
+
+config ADK_TARGET_CPU_M68K_68060
+	bool "68060"
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+	depends on ADK_TARGET_ARCH_M68K
+
+# metag
+config ADK_TARGET_CPU_METAG
+	bool "metag"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFPV3
-	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_METAG
 
-config ADK_CPU_CORTEX_A7
-	bool
+# microblaze
+config ADK_TARGET_CPU_MICROBLAZE
+	bool "microblaze"
+	select ADK_TARGET_WITHOUT_THREADS if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITHOUT_CXX if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
+	depends on ADK_TARGET_ARCH_MICROBLAZE
+
+# mips32
+config ADK_TARGET_CPU_MIPS_MIPS32
+	bool "mips32"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFPV4
-	select ADK_TARGET_CPU_WITH_NEON
+	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_MIPS
 
-config ADK_CPU_CORTEX_A8
-	bool
+config ADK_TARGET_CPU_MIPS_MIPS32R2
+	bool "mips32r2"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFPV3
-	select ADK_TARGET_CPU_WITH_NEON
+	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_MIPS
 
-config ADK_CPU_CORTEX_A9
-	bool
+config ADK_TARGET_CPU_MIPS_MIPS32R6
+	bool "mips32r6"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFPV3
-	select ADK_TARGET_CPU_WITH_NEON
+	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_MIPS
 
-config ADK_CPU_CORTEX_A15
-	bool
+# mips64
+config ADK_TARGET_CPU_MIPS64_MIPS64
+	bool "mips64"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFPV4
-	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_MIPS64
 
-config ADK_CPU_CORTEX_A17
-	bool
+config ADK_TARGET_CPU_MIPS64_MIPS64R2
+	bool "mips64r2"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU_VFPV4
-	select ADK_TARGET_CPU_WITH_NEON
+	depends on ADK_TARGET_ARCH_MIPS64
 
-config ADK_CPU_CORTEX_A53
-	bool
+config ADK_TARGET_CPU_MIPS64_MIPS64R6
+	bool "mips64r6"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_MIPS64
 
-config ADK_CPU_CORTEX_A57
-	bool
+config ADK_TARGET_CPU_MIPS64_LOONGSON2F
+	bool "loongson2f"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_MIPS64
 
-config ADK_CPU_CRIS_V10
-	bool
-	select ADK_TARGET_WITH_LT
+# moxie
+config ADK_TARGET_CPU_MOXIE
+	bool "moxie"
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_MOXIE
 
-config ADK_CPU_CRIS_V32
-	bool
-	select ADK_TARGET_WITH_LT
+# nds32
+config ADK_TARGET_CPU_NDS32
+	bool "nds32"
+	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_NDS32
 
-config ADK_CPU_GEODE
-	bool
-	select ADK_TARGET_WITH_NPTL
+# nios2
+config ADK_TARGET_CPU_NIOS2
+	bool "nios2"
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITHOUT_CXX if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
+	depends on ADK_TARGET_ARCH_NIOS2
 
-config ADK_CPU_FRV
-	bool
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_WITHOUT_THREADS
-	select ADK_TARGET_WITHOUT_CXX
+# openrisc
+config ADK_TARGET_CPU_OR1K
+	bool "or1k"
+	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITHOUT_CXX if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_MUSL
+	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_OR1K
 
-config ADK_CPU_H8300
-	bool
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_WITHOUT_THREADS
-	select ADK_TARGET_WITHOUT_CXX
 
-config ADK_CPU_I486
-	bool
+# ppc32
+config ADK_TARGET_CPU_PPC
+	bool "ppc"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_PPC
 
-config ADK_CPU_I586
-	bool
+config ADK_TARGET_CPU_PPC_440
+	bool "ppc400"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_PPC
 
-config ADK_CPU_I686
-	bool
+# ppc64
+config ADK_TARGET_CPU_PPC64_POWER6
+	bool "power6"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_PPC64
 
-config ADK_CPU_LM32
-	bool
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_WITHOUT_THREADS
-
-config ADK_CPU_LOONGSON2F
-	bool
+config ADK_TARGET_CPU_PPC64_POWER7
+	bool "power7"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_PPC64
 
-config ADK_CPU_M68K
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+config ADK_TARGET_CPU_PPC64_POWER8
+	bool "power8"
+	select ADK_LINUX_64
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_PPC64
 
-config ADK_CPU_68020
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+# s390
+config ADK_TARGET_CPU_S390_Z900
+	bool "z900"
+	select ADK_LINUX_64
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_S390
 
-config ADK_CPU_68030
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+# sh
+config ADK_TARGET_CPU_SH_SH2
+	bool "sh2"
+	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_WITH_LT
+	select ADK_TARGET_WITHOUT_CXX
+	depends on ADK_TARGET_ARCH_SH
 
-config ADK_CPU_68040
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
-	select ADK_TARGET_CPU_WITH_FPU
+config ADK_TARGET_CPU_SH_SH2A
+	bool "sh2a"
+	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_WITH_LT
+	select ADK_TARGET_WITHOUT_CXX
+	depends on ADK_TARGET_ARCH_SH
 
-config ADK_CPU_68060
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+config ADK_TARGET_CPU_SH_SH3
+	bool "sh3"
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_SH
 
-config ADK_CPU_IA64
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+config ADK_TARGET_CPU_SH_SH4
+	bool "sh4"
+	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
+	depends on ADK_TARGET_ARCH_SH
 
-config ADK_CPU_METAG
-	bool
+config ADK_TARGET_CPU_SH_SH4A
+	bool "sh4a"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_SH
 
-config ADK_CPU_MIPS32
-	bool
+# sparc
+config ADK_TARGET_CPU_SPARC_V8
+	bool "v8"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_SPARC
 
-config ADK_CPU_MIPS32R2
-	bool
+config ADK_TARGET_CPU_SPARC_V7
+	bool "v7"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_SPARC
 
-config ADK_CPU_MIPS32R6
-	bool
+config ADK_TARGET_CPU_SPARC_LEON
+	bool "leon"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_CPU_WITH_FPU
+	depends on ADK_TARGET_ARCH_SPARC
 
-config ADK_CPU_MIPS64
-	bool
+# sparc64
+config ADK_TARGET_CPU_SPARC_V9
+	bool "v9"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_SPARC64
 
-config ADK_CPU_MIPS64R2
-	bool
-	select ADK_LINUX_64
+# tile
+config ADK_TARGET_CPU_TILE_TILEGX
+	bool "tilegx"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_TILE
 
-config ADK_CPU_MIPS64R6
-	bool
-	select ADK_LINUX_64
+config ADK_TARGET_CPU_TILE_TILEPRO
+	bool "tilepro"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_TILE
 
-config ADK_CPU_MICROBLAZE
-	bool
-	select ADK_TARGET_WITHOUT_THREADS if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITHOUT_CXX if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_MMU if !ADK_LINUX_UCLINUX
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
+# v850
+config ADK_TARGET_CPU_V850
+	bool "v850"
+	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_WITHOUT_THREADS
+	select ADK_TARGET_WITHOUT_CXX
+	depends on ADK_TARGET_ARCH_V850
 
-config ADK_CPU_MOXIE
-	bool
+# x86
+config ADK_TARGET_CPU_X86_I486
+	bool "i486"
+	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_X86
 
-config ADK_CPU_NDS32
-	bool
+config ADK_TARGET_CPU_X86_I586
+	bool "i586"
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_X86
 
-config ADK_CPU_NIOS2
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITHOUT_CXX if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+config ADK_TARGET_CPU_X86_I686
+	bool "i686"
+	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
+	depends on ADK_TARGET_ARCH_X86
 
-config ADK_CPU_OPTERON
-	bool
+config ADK_TARGET_CPU_X86_GEODE
+	bool "geode"
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_X86
+
+config ADK_TARGET_CPU_X86_ATOM
+	bool "atom"
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_X86
+
+config ADK_TARGET_CPU_X86_PENTIUM_M
+	bool "pentium-m"
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_X86
+
+# x86_64
+config ADK_TARGET_CPU_X86_64
+	bool "Generic x86_64"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	depends on ADK_TARGET_ARCH_X86_64
+
+config ADK_TARGET_CPU_X86_64_ATHLON_FX
+	bool "Athlon 64 FX"
+	select ADK_LINUX_64
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_CPU_WITH_MMX
 	select ADK_TARGET_CPU_WITH_SSE
 	select ADK_TARGET_CPU_WITH_SSE2
 	select ADK_TARGET_CPU_WITH_3DNOW
 	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_OPTERON_SSE3
-	bool
+config ADK_TARGET_CPU_X86_64_ATHLON_64
+	bool "Athlon 64"
 	select ADK_LINUX_64
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_3DNOW
+	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_X86_64
+
+config ADK_TARGET_CPU_X86_64_ATHLON_64_SSE3
+	bool "Athlon 64 with SSE3"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_CPU_WITH_MMX
 	select ADK_TARGET_CPU_WITH_SSE
 	select ADK_TARGET_CPU_WITH_SSE2
 	select ADK_TARGET_CPU_WITH_SSE3
 	select ADK_TARGET_CPU_WITH_3DNOW
 	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_OR1K
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITHOUT_CXX if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_MUSL
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+config ADK_TARGET_CPU_X86_64_BARCELONA
+	bool "Barcelona"
+	select ADK_LINUX_64
+	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4A
+	select ADK_TARGET_CPU_WITH_3DNOW
+	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_PARISC
-	bool
-	select ADK_TARGET_WITH_LT if ADK_TARGET_LIB_UCLIBC_NG
-	select ADK_TARGET_WITH_NPTL if ADK_TARGET_LIB_GLIBC
+config ADK_TARGET_CPU_X86_64_BDVER1
+	bool "bdver1"
+	select ADK_LINUX_64
+	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
-	select ADK_TARGET_USE_STATIC_LIBS if ADK_TARGET_LIB_UCLIBC_NG
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4A
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_PENTIUM_M
-	bool
+config ADK_TARGET_CPU_X86_64_BDVER2
+	bool "bdver2"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4A
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_PPC
-	bool
+config ADK_TARGET_CPU_X86_64_BDVER3
+	bool "bdver3"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4A
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_PPC_440
-	bool
+config ADK_TARGET_CPU_X86_64_BDVER4
+	bool "bdver4"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4A
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_POWER6
-	bool
+config ADK_TARGET_CPU_X86_64_BONNELL
+	bool "Bonnell"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_POWER7
-	bool
+config ADK_TARGET_CPU_X86_64_BROADWELL
+	bool "Broadwell"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_POWER8
-	bool
+config ADK_TARGET_CPU_X86_64_BTVER1
+	bool "btver1"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4A
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_PPC64
-	bool
+config ADK_TARGET_CPU_X86_64_BTVER2
+	bool "btver2"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4A
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_SANDYBRIDGE
-	bool
+config ADK_TARGET_CPU_X86_64_CORE2
+	bool "Core 2"
 	select ADK_LINUX_64
+	select ADK_TARGET_WITH_NPTL
+	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
+
+config ADK_TARGET_CPU_X86_64_HASWELL
+	bool "Haswell"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_CPU_WITH_MMX
 	select ADK_TARGET_CPU_WITH_SSE
 	select ADK_TARGET_CPU_WITH_SSE2
@@ -952,38 +1075,52 @@ config ADK_CPU_SANDYBRIDGE
 	select ADK_TARGET_CPU_WITH_SSE4_1
 	select ADK_TARGET_CPU_WITH_SSE4_2
 	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_SH2
-	bool
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_WITH_LT
-	select ADK_TARGET_WITHOUT_CXX
-
-config ADK_CPU_SH2A
-	bool
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_WITH_LT
-	select ADK_TARGET_WITHOUT_CXX
-
-config ADK_CPU_SH3
-	bool
+config ADK_TARGET_CPU_X86_64_IVYBRIDGE
+	bool "Ivybridge"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_SH4
-	bool
+config ADK_TARGET_CPU_X86_64_K8
+	bool "K8"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_3DNOW
+	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_SH4A
-	bool
+config ADK_TARGET_CPU_X86_64_K8_SSE3
+	bool "K8 with SSE3"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_3DNOW
+	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_SILVERMONT
-	bool
+config ADK_TARGET_CPU_X86_64_KNL
+	bool "knl"
 	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
 	select ADK_TARGET_CPU_WITH_MMX
@@ -993,45 +1130,81 @@ config ADK_CPU_SILVERMONT
 	select ADK_TARGET_CPU_WITH_SSE4_1
 	select ADK_TARGET_CPU_WITH_SSE4_2
 	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_SPARC_V8
-	bool
+config ADK_TARGET_CPU_X86_64_NEHALEM
+	bool "Nehalem"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_SPARC_LEON
-	bool
+config ADK_TARGET_CPU_X86_64_NOCONA
+	bool "Nocona"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_SPARC_V9
-	bool
+config ADK_TARGET_CPU_X86_64_OPTERON
+	bool "Opteron"
 	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_3DNOW
+	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_TILEPRO
-	bool
+config ADK_TARGET_CPU_X86_64_OPTERON_SSE3
+	bool "Opteron with SSE3"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_3DNOW
+	select ADK_TARGET_CPU_WITH_3DNOWEXT
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_TILEGX
-	bool
+config ADK_TARGET_CPU_X86_64_SANDYBRIDGE
+	bool "Sandybridge"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_V850
-	bool
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_WITHOUT_THREADS
-	select ADK_TARGET_WITHOUT_CXX
-
-config ADK_CPU_WESTMERE
-	bool
+config ADK_TARGET_CPU_X86_64_SILVERMONT
+	bool "Silvermont"
 	select ADK_LINUX_64
-	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
 	select ADK_TARGET_CPU_WITH_MMX
 	select ADK_TARGET_CPU_WITH_SSE
 	select ADK_TARGET_CPU_WITH_SSE2
@@ -1039,31 +1212,67 @@ config ADK_CPU_WESTMERE
 	select ADK_TARGET_CPU_WITH_SSE4_1
 	select ADK_TARGET_CPU_WITH_SSE4_2
 	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_X86
-	bool
+config ADK_TARGET_CPU_X86_64_WESTMERE
+	bool "Westmere"
+	select ADK_LINUX_64
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_TARGET_CPU_WITH_VT
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_SSE3
+	select ADK_TARGET_CPU_WITH_SSE4_1
+	select ADK_TARGET_CPU_WITH_SSE4_2
+	select ADK_TARGET_CPU_WITH_SSSE3
+	depends on ADK_TARGET_ARCH_X86_64
 
-config ADK_CPU_X86_64
-	bool
-	select ADK_LINUX_64
+# xtensa
+config ADK_TARGET_CPU_XTENSA_DC233C
+	bool "dc233c"
+	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_KERNEL_XTENSA_VARIANT_DC233C
+	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
+	depends on ADK_TARGET_ARCH_XTENSA
 
-config ADK_CPU_XSCALE
-	bool
+config ADK_TARGET_CPU_XTENSA_DC232B
+	bool "dc232b"
+	depends on ADK_TARGET_LITTLE_ENDIAN
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_KERNEL_XTENSA_VARIANT_DC232B
+	select ADK_TARGET_KERNEL_ZIMAGE
+	depends on ADK_TARGET_ARCH_XTENSA
 
-config ADK_CPU_XTENSA
-	bool
+config ADK_TARGET_CPU_XTENSA_DE212
+	bool "de212"
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_WITH_LT
+	select ADK_TARGET_WITHOUT_MMU
+	select ADK_TARGET_UCLINUX
+	select ADK_KERNEL_XTENSA_VARIANT_CUSTOM
+	select ADK_TARGET_KERNEL_ZIMAGE
+	depends on ADK_TARGET_ARCH_XTENSA
 
-config ADK_CPU_Z900
-	bool
-	select ADK_LINUX_64
+config ADK_TARGET_CPU_XTENSA_FSF
+	bool "fsf"
+	depends on ADK_TARGET_BIG_ENDIAN
 	select ADK_TARGET_WITH_NPTL
 	select ADK_TARGET_WITH_MMU
+	select ADK_KERNEL_XTENSA_VARIANT_FSF
+	select ADK_TARGET_KERNEL_ZIMAGE
+	depends on ADK_TARGET_ARCH_XTENSA
+
+endchoice
+
+# coldfire helper variable for gcc
+config ADK_TARGET_CPU_CF
+	bool
 
 # CPU features
 config ADK_TARGET_CPU_WITH_FPU
@@ -1129,251 +1338,267 @@ config ADK_TARGET_CPU_WITH_3DNOW
 config ADK_TARGET_CPU_WITH_3DNOWEXT
 	bool
 
+# for gcc --with-cpu
 config ADK_TARGET_GCC_CPU
 	string
-	default "440" if ADK_CPU_PPC_440
-	default "51" if ADK_CPU_CF_51
-	default "5206" if ADK_CPU_CF_5206
-	default "5206e" if ADK_CPU_CF_5206E
-	default "5208" if ADK_CPU_CF_5208
-	default "5211a" if ADK_CPU_CF_5211A
-	default "5213" if ADK_CPU_CF_5213
-	default "5216" if ADK_CPU_CF_5216
-	default "52235" if ADK_CPU_CF_52235
-	default "5225" if ADK_CPU_CF_5225
-	default "52259" if ADK_CPU_CF_52259
-	default "5235" if ADK_CPU_CF_5235
-	default "5249" if ADK_CPU_CF_5249
-	default "5250" if ADK_CPU_CF_5250
-	default "5271" if ADK_CPU_CF_5271
-	default "5272" if ADK_CPU_CF_5272
-	default "5275" if ADK_CPU_CF_5275
-	default "5282" if ADK_CPU_CF_5282
-	default "53017" if ADK_CPU_CF_53017
-	default "5307" if ADK_CPU_CF_5307
-	default "5328" if ADK_CPU_CF_5328
-	default "5329" if ADK_CPU_CF_5329
-	default "5373" if ADK_CPU_CF_5373
-	default "5407" if ADK_CPU_CF_5407
-	default "5475" if ADK_CPU_CF_5475
-	default "68020" if ADK_CPU_68020
-	default "68030" if ADK_CPU_68030
-	default "68040" if ADK_CPU_68040
-	default "68060" if ADK_CPU_68060
-	default "arc700" if ADK_CPU_ARC700
-	default "archs" if ADK_CPU_ARC_HS
-	default "arm1176jzf-s" if ADK_CPU_ARM1176JZF_S
-	default "arm926ej-s" if ADK_CPU_ARM926EJ_S
-	default "armv8-a" if ADK_CPU_ARMV8
-	default "cortex-a5" if ADK_CPU_CORTEX_A5
-	default "cortex-a7" if ADK_CPU_CORTEX_A7
-	default "cortex-a8" if ADK_CPU_CORTEX_A8
-	default "cortex-a9" if ADK_CPU_CORTEX_A9
-	default "cortex-a15" if ADK_CPU_CORTEX_A15
-	default "cortex-a17" if ADK_CPU_CORTEX_A17
-	default "cortex-a53" if ADK_CPU_CORTEX_A53
-	default "cortex-a57" if ADK_CPU_CORTEX_A57
-	default "cortex-m3" if ADK_CPU_CORTEX_M3
-	default "cortex-m4" if ADK_CPU_CORTEX_M4
-	default "mpcore" if ADK_CPU_ARM11MPCORE
-	default "powerpc" if ADK_CPU_PPC
-	default "power7" if ADK_CPU_POWER7
-	default "power8" if ADK_CPU_POWER8
-	default "ultrasparc" if ADK_CPU_SPARC_V9
-	default "v8" if ADK_CPU_SPARC_V8
-	default "leon" if ADK_CPU_SPARC_LEON
-	default "xscale" if ADK_CPU_XSCALE
-
+	default "440" if ADK_TARGET_CPU_PPC_440
+	default "51" if ADK_TARGET_CPU_CF_51
+	default "5206" if ADK_TARGET_CPU_CF_5206
+	default "5206e" if ADK_TARGET_CPU_CF_5206E
+	default "5208" if ADK_TARGET_CPU_CF_5208
+	default "5211a" if ADK_TARGET_CPU_CF_5211A
+	default "5213" if ADK_TARGET_CPU_CF_5213
+	default "5216" if ADK_TARGET_CPU_CF_5216
+	default "52235" if ADK_TARGET_CPU_CF_52235
+	default "5225" if ADK_TARGET_CPU_CF_5225
+	default "52259" if ADK_TARGET_CPU_CF_52259
+	default "5235" if ADK_TARGET_CPU_CF_5235
+	default "5249" if ADK_TARGET_CPU_CF_5249
+	default "5250" if ADK_TARGET_CPU_CF_5250
+	default "5271" if ADK_TARGET_CPU_CF_5271
+	default "5272" if ADK_TARGET_CPU_CF_5272
+	default "5275" if ADK_TARGET_CPU_CF_5275
+	default "5282" if ADK_TARGET_CPU_CF_5282
+	default "53017" if ADK_TARGET_CPU_CF_53017
+	default "5307" if ADK_TARGET_CPU_CF_5307
+	default "5328" if ADK_TARGET_CPU_CF_5328
+	default "5329" if ADK_TARGET_CPU_CF_5329
+	default "5373" if ADK_TARGET_CPU_CF_5373
+	default "5407" if ADK_TARGET_CPU_CF_5407
+	default "5475" if ADK_TARGET_CPU_CF_5475
+	default "68020" if ADK_TARGET_CPU_M68K_68020
+	default "68030" if ADK_TARGET_CPU_M68K_68030
+	default "68040" if ADK_TARGET_CPU_M68K_68040
+	default "68060" if ADK_TARGET_CPU_M68K_68060
+	default "archs" if ADK_TARGET_CPU_ARC_ARC_HS
+	default "arm1176jzf-s" if ADK_TARGET_CPU_ARM_ARM1176JZF_S
+	default "arm926ej-s" if ADK_TARGET_CPU_ARM_ARM926EJ_S
+	default "cortex-a5" if ADK_TARGET_CPU_ARM_CORTEX_A5
+	default "cortex-a7" if ADK_TARGET_CPU_ARM_CORTEX_A7
+	default "cortex-a8" if ADK_TARGET_CPU_ARM_CORTEX_A8
+	default "cortex-a9" if ADK_TARGET_CPU_ARM_CORTEX_A9
+	default "cortex-a15" if ADK_TARGET_CPU_ARM_CORTEX_A15
+	default "cortex-a17" if ADK_TARGET_CPU_ARM_CORTEX_A17
+	default "cortex-a53" if ADK_TARGET_CPU_AARCH64_CORTEX_A53
+	default "cortex-a57" if ADK_TARGET_CPU_AARCH64_CORTEX_A57
+	default "cortex-m3" if ADK_TARGET_CPU_ARM_CORTEX_M3
+	default "cortex-m4" if ADK_TARGET_CPU_ARM_CORTEX_M4
+	default "leon" if ADK_TARGET_CPU_SPARC_LEON
+	default "mpcore" if ADK_TARGET_CPU_ARM_ARM11MPCORE
+	default "powerpc" if ADK_TARGET_CPU_PPC
+	default "power6" if ADK_TARGET_CPU_PPC64_POWER6
+	default "power7" if ADK_TARGET_CPU_PPC64_POWER7
+	default "power8" if ADK_TARGET_CPU_PPC64_POWER8
+	default "ultrasparc" if ADK_TARGET_CPU_SPARC64_V9
+	default "v8" if ADK_TARGET_CPU_SPARC_V8
+	default "xscale" if ADK_TARGET_CPU_ARM_XSCALE
+
+# for gcc --with-arch
 config ADK_TARGET_GCC_ARCH
 	string
-	default "btver1" if ADK_CPU_AMD_BOBCAT
-	default "amdfam10" if ADK_CPU_AMDFAM10
-	default "athlon" if ADK_CPU_ATHLON
-	default "athlon-fx" if ADK_CPU_ATHLON_FX
-	default "athlon64" if ADK_CPU_ATHLON_64
-	default "athlon64-sse3" if ADK_CPU_ATHLON_64_SSE3
-	default "atom" if ADK_CPU_ATOM
-	default "barcelona" if ADK_CPU_BARCELONA
-	default "bdver1" if ADK_CPU_BDVER1
-	default "bdver2" if ADK_CPU_BDVER2
-	default "bdver3" if ADK_CPU_BDVER3
-	default "bdver4" if ADK_CPU_BDVER4
-	default "bonnell" if ADK_CPU_BONNEL
-	default "broadwell" if ADK_CPU_BROADWELL
-	default "btver1" if ADK_CPU_BTVER1
-	default "btver2" if ADK_CPU_BTVER2
-	default "core2" if ADK_CPU_CORE2
-	default "geode" if ADK_CPU_GEODE
-	default "haswell" if ADK_CPU_HASWELL
-	default "i486" if ADK_CPU_I486
-	default "i586" if ADK_CPU_I586
-	default "i686" if ADK_CPU_I686
-	default "ivybridge" if ADK_CPU_IVYBRIDGE
-	default "k8" if ADK_CPU_K8
-	default "k8-sse3" if ADK_CPU_K8_SSE3
-	default "knl" if ADK_CPU_KNL
-	default "loongson2f" if ADK_CPU_LOONGSON2F
-	default "mips32" if ADK_CPU_MIPS32
-	default "mips32r2" if ADK_CPU_MIPS32R2
-	default "mips32r6" if ADK_CPU_MIPS32R6
-	default "mips64" if ADK_CPU_MIPS64
-	default "mips64r2" if ADK_CPU_MIPS64R2
-	default "mips64r6" if ADK_CPU_MIPS64R6
-	default "nehalem" if ADK_CPU_NEHALEM
-	default "nocona" if ADK_CPU_NOCONA
-	default "opteron" if ADK_CPU_OPTERON
-	default "opteron-sse3" if ADK_CPU_OPTERON_SSE3
-	default "pentium-m" if ADK_CPU_PENTIUM_M
-	default "sandybridge" if ADK_CPU_SANDYBRIDGE
-	default "silvermont" if ADK_CPU_SILVERMONT
-	default "westmere" if ADK_CPU_WESTMERE
-	default "x86-64" if ADK_CPU_X86_64
-	default "z900" if ADK_CPU_Z900
-
+	default "athlon" if ADK_TARGET_CPU_X86_64_ATHLON
+	default "athlon-fx" if ADK_TARGET_CPU_X86_64_ATHLON_FX
+	default "athlon64" if ADK_TARGET_CPU_X86_64_ATHLON_64
+	default "athlon64-sse3" if ADK_TARGET_CPU_X86_64_ATHLON_64_SSE3
+	default "atom" if ADK_TARGET_CPU_X86_ATOM
+	default "barcelona" if ADK_TARGET_CPU_X86_64_BARCELONA
+	default "bdver1" if ADK_TARGET_CPU_X86_64_BDVER1
+	default "bdver2" if ADK_TARGET_CPU_X86_64_BDVER2
+	default "bdver3" if ADK_TARGET_CPU_X86_64_BDVER3
+	default "bdver4" if ADK_TARGET_CPU_X86_64_BDVER4
+	default "bonnell" if ADK_TARGET_CPU_X86_64_BONNEL
+	default "broadwell" if ADK_TARGET_CPU_X86_64_BROADWELL
+	default "btver1" if ADK_TARGET_CPU_X86_64_BTVER1
+	default "btver2" if ADK_TARGET_CPU_X86_64_BTVER2
+	default "core2" if ADK_TARGET_CPU_X86_64_CORE2
+	default "geode" if ADK_TARGET_CPU_X86_GEODE
+	default "haswell" if ADK_TARGET_CPU_X86_64_HASWELL
+	default "i486" if ADK_TARGET_CPU_X86_I486
+	default "i586" if ADK_TARGET_CPU_X86_I586
+	default "i686" if ADK_TARGET_CPU_X86_I686
+	default "ivybridge" if ADK_TARGET_CPU_X86_64_IVYBRIDGE
+	default "k8" if ADK_TARGET_CPU_X86_64_K8
+	default "k8-sse3" if ADK_TARGET_CPU_X86_64_K8_SSE3
+	default "knl" if ADK_TARGET_CPU_X86_64_KNL
+	default "loongson2f" if ADK_TARGET_CPU_MIPS64_LOONGSON2F
+	default "mips32" if ADK_TARGET_CPU_MIPS_MIPS32
+	default "mips32r2" if ADK_TARGET_CPU_MIPS_MIPS32R2
+	default "mips32r6" if ADK_TARGET_CPU_MIPS_MIPS32R6
+	default "mips64" if ADK_TARGET_CPU_MIPS64_MIPS64
+	default "mips64r2" if ADK_TARGET_CPU_MIPS64_MIPS64R2
+	default "mips64r6" if ADK_TARGET_CPU_MIPS64_MIPS64R6
+	default "nehalem" if ADK_TARGET_CPU_X86_64_NEHALEM
+	default "nocona" if ADK_TARGET_CPU_X86_64_NOCONA
+	default "opteron" if ADK_TARGET_CPU_X86_64_OPTERON
+	default "opteron-sse3" if ADK_TARGET_CPU_X86_64_OPTERON_SSE3
+	default "pentium-m" if ADK_TARGET_CPU_X86_PENTIUM_M
+	default "sandybridge" if ADK_TARGET_CPU_X86_64_SANDYBRIDGE
+	default "silvermont" if ADK_TARGET_CPU_X86_64_SILVERMONT
+	default "westmere" if ADK_TARGET_CPU_X86_64_WESTMERE
+	default "x86-64" if ADK_TARGET_CPU_X86_64
+	default "z900" if ADK_TARGET_CPU_S390_Z900
+
+# for CFLAGS/CXXFLAGS if gcc does not support --with-cpu
 config ADK_TARGET_CPU_FLAGS
 	string
-	default "-mcpu=bf512" if ADK_CPU_BF512
-	default "-mcpu=bf514" if ADK_CPU_BF514
-	default "-mcpu=bf516" if ADK_CPU_BF516
-	default "-mcpu=bf518" if ADK_CPU_BF518
-	default "-mcpu=bf522" if ADK_CPU_BF522
-	default "-mcpu=bf523" if ADK_CPU_BF523
-	default "-mcpu=bf524" if ADK_CPU_BF524
-	default "-mcpu=bf525" if ADK_CPU_BF525
-	default "-mcpu=bf526" if ADK_CPU_BF526
-	default "-mcpu=bf527" if ADK_CPU_BF527
-	default "-mcpu=bf531" if ADK_CPU_BF531
-	default "-mcpu=bf532" if ADK_CPU_BF532
-	default "-mcpu=bf533" if ADK_CPU_BF533
-	default "-mcpu=bf534" if ADK_CPU_BF534
-	default "-mcpu=bf536" if ADK_CPU_BF536
-	default "-mcpu=bf537" if ADK_CPU_BF537
-	default "-mcpu=bf538" if ADK_CPU_BF538
-	default "-mcpu=bf539" if ADK_CPU_BF539
-	default "-mcpu=bf542" if ADK_CPU_BF542
-	default "-mcpu=bf544" if ADK_CPU_BF544
-	default "-mcpu=bf547" if ADK_CPU_BF547
-	default "-mcpu=bf548" if ADK_CPU_BF548
-	default "-mcpu=bf549" if ADK_CPU_BF549
-	default "-mcpu=bf542m" if ADK_CPU_BF542M
-	default "-mcpu=bf544m" if ADK_CPU_BF544M
-	default "-mcpu=bf547m" if ADK_CPU_BF547M
-	default "-mcpu=bf548m" if ADK_CPU_BF548M
-	default "-mcpu=bf549m" if ADK_CPU_BF549M
-	default "-mcpu=bf561" if ADK_CPU_BF561
-	default "-mcpu=bf592" if ADK_CPU_BF592
-	default "-mcpu=v10" if ADK_CPU_CRIS_V10
-	default "-mcpu=v32" if ADK_CPU_CRIS_V32
-	default "-mmetac=2.1" if ADK_CPU_METAG
-	default "-mcpu=v7.10.d" if ADK_CPU_MICROBLAZE
-	default "-m2" if ADK_CPU_SH2
-	default "-m2a" if ADK_CPU_SH2A
-	default "-m3" if ADK_CPU_SH3
-	default "-m4" if ADK_CPU_SH4
-	default "-m4a" if ADK_CPU_SH4A
-	default "-mcpu=powerpc64" if ADK_CPU_PPC64 && ADK_TARGET_BIG_ENDIAN
-	default "-mcpu=powerpc64le" if ADK_CPU_PPC64 && ADK_TARGET_LITTLE_ENDIAN
-	default "-mcpu=tilegx" if ADK_CPU_TILEGX
-	default "-mcpu=tilepro" if ADK_CPU_TILEPRO
-
+	default "-mcpu=ARC700" if ADK_TARGET_CPU_ARC_ARC700
+	default "-mcpu=bf512" if ADK_TARGET_CPU_BFIN_BF512
+	default "-mcpu=bf514" if ADK_TARGET_CPU_BFIN_BF514
+	default "-mcpu=bf516" if ADK_TARGET_CPU_BFIN_BF516
+	default "-mcpu=bf518" if ADK_TARGET_CPU_BFIN_BF518
+	default "-mcpu=bf522" if ADK_TARGET_CPU_BFIN_BF522
+	default "-mcpu=bf523" if ADK_TARGET_CPU_BFIN_BF523
+	default "-mcpu=bf524" if ADK_TARGET_CPU_BFIN_BF524
+	default "-mcpu=bf525" if ADK_TARGET_CPU_BFIN_BF525
+	default "-mcpu=bf526" if ADK_TARGET_CPU_BFIN_BF526
+	default "-mcpu=bf527" if ADK_TARGET_CPU_BFIN_BF527
+	default "-mcpu=bf531" if ADK_TARGET_CPU_BFIN_BF531
+	default "-mcpu=bf532" if ADK_TARGET_CPU_BFIN_BF532
+	default "-mcpu=bf533" if ADK_TARGET_CPU_BFIN_BF533
+	default "-mcpu=bf534" if ADK_TARGET_CPU_BFIN_BF534
+	default "-mcpu=bf536" if ADK_TARGET_CPU_BFIN_BF536
+	default "-mcpu=bf537" if ADK_TARGET_CPU_BFIN_BF537
+	default "-mcpu=bf538" if ADK_TARGET_CPU_BFIN_BF538
+	default "-mcpu=bf539" if ADK_TARGET_CPU_BFIN_BF539
+	default "-mcpu=bf542" if ADK_TARGET_CPU_BFIN_BF542
+	default "-mcpu=bf544" if ADK_TARGET_CPU_BFIN_BF544
+	default "-mcpu=bf547" if ADK_TARGET_CPU_BFIN_BF547
+	default "-mcpu=bf548" if ADK_TARGET_CPU_BFIN_BF548
+	default "-mcpu=bf549" if ADK_TARGET_CPU_BFIN_BF549
+	default "-mcpu=bf542m" if ADK_TARGET_CPU_BFIN_BF542M
+	default "-mcpu=bf544m" if ADK_TARGET_CPU_BFIN_BF544M
+	default "-mcpu=bf547m" if ADK_TARGET_CPU_BFIN_BF547M
+	default "-mcpu=bf548m" if ADK_TARGET_CPU_BFIN_BF548M
+	default "-mcpu=bf549m" if ADK_TARGET_CPU_BFIN_BF549M
+	default "-mcpu=bf561" if ADK_TARGET_CPU_BFIN_BF561
+	default "-mcpu=bf592" if ADK_TARGET_CPU_BFIN_BF592
+	default "-mcpu=v10" if ADK_TARGET_CPU_CRIS_CRISV10
+	default "-mcpu=v32" if ADK_TARGET_CPU_CRIS_CRISV32
+	default "-mmetac=2.1" if ADK_TARGET_CPU_METAG
+	default "-mcpu=v7.10.d" if ADK_TARGET_CPU_MICROBLAZE
+	default "-m2" if ADK_TARGET_CPU_SH_SH2
+	default "-m2a" if ADK_TARGET_CPU_SH_SH2A
+	default "-m3" if ADK_TARGET_CPU_SH_SH3
+	default "-m4" if ADK_TARGET_CPU_SH_SH4
+	default "-m4a" if ADK_TARGET_CPU_SH_SH4A
+	default "-mcpu=powerpc64" if ADK_TARGET_ARCH_PPC64 && ADK_TARGET_BIG_ENDIAN
+	default "-mcpu=powerpc64le" if ADK_TARGET_ARCH_PPC64 && ADK_TARGET_LITTLE_ENDIAN
+	default "-mcpu=tilegx" if ADK_TARGET_CPU_TILE_TILEGX
+	default "-mcpu=tilepro" if ADK_TARGET_CPU_TILE_TILEPRO
+
+# ADK suffix
 config ADK_TARGET_CPU_TYPE
 	string
-	depends on ADK_TARGET_TOOLCHAIN
-	default "arc700" if ADK_TARGET_ARCH_ARC && ADK_CPU_ARC700
-	default "archs" if ADK_TARGET_ARCH_ARC && ADK_CPU_ARC_HS
-	default "bf512" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF512
-	default "bf514" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF514
-	default "bf516" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF516
-	default "bf518" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF518
-	default "bf522" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF522
-	default "bf523" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF523
-	default "bf524" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF524
-	default "bf525" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF525
-	default "bf526" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF526
-	default "bf527" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF527
-	default "bf531" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF531
-	default "bf532" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF532
-	default "bf533" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF533
-	default "bf534" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF534
-	default "bf536" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF536
-	default "bf537" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF537
-	default "bf538" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF538
-	default "bf539" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF539
-	default "bf542" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF542
-	default "bf544" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF544
-	default "bf547" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF547
-	default "bf548" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF548
-	default "bf549" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF549
-	default "bf542m" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF542M
-	default "bf544m" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF544M
-	default "bf547m" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF547M
-	default "bf548m" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF548M
-	default "bf549m" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF549M
-	default "bf561" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF561
-	default "bf592" if ADK_TARGET_ARCH_BFIN && ADK_CPU_BF592
-	default "51" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_51
-	default "5206" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5206
-	default "5206e" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5206E
-	default "5208" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5208
-	default "5211a" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5211A
-	default "5213" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5213
-	default "5216" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5216
-	default "52235" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_52235
-	default "5225" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5225
-	default "52259" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_52259
-	default "5235" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5235
-	default "5249" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5249
-	default "5250" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5250
-	default "5271" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5271
-	default "5272" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5272
-	default "5275" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5275
-	default "5282" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5282
-	default "53017" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_53017
-	default "5307" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5307
-	default "5328" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5328
-	default "5329" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5329
-	default "5373" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5373
-	default "5407" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5407
-	default "5475" if ADK_TARGET_ARCH_M68K && ADK_CPU_CF_5475
-	default "68020" if ADK_TARGET_ARCH_M68K && ADK_CPU_68020
-	default "68030" if ADK_TARGET_ARCH_M68K && ADK_CPU_68030
-	default "68040" if ADK_TARGET_ARCH_M68K && ADK_CPU_68040
-	default "68060" if ADK_TARGET_ARCH_M68K && ADK_CPU_68060
-	default "cortex_a5" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A5
-	default "cortex_a7" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A7
-	default "cortex_a8" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A8
-	default "cortex_a9" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A9
-	default "cortex_a15" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A15
-	default "cortex_a17" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_A17
-	default "cortex_m3" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_M3
-	default "cortex_m4" if ADK_TARGET_ARCH_ARM && ADK_CPU_CORTEX_M4
-	default "arm1176jzf_s" if ADK_TARGET_ARCH_ARM && ADK_CPU_ARM1176JZF_S
-	default "arm926ej_s" if ADK_TARGET_ARCH_ARM && ADK_CPU_ARM926EJ_S
-	default "mpcore" if ADK_TARGET_ARCH_ARM && ADK_CPU_ARM11MPCORE
-	default "cortex_a53" if ADK_TARGET_ARCH_AARCH64 && ADK_CPU_CORTEX_A53
-	default "cortex_a57" if ADK_TARGET_ARCH_AARCH64 && ADK_CPU_CORTEX_A57
-
+	default "arc700" if ADK_TARGET_CPU_ARC_ARC700
+	default "archs" if ADK_TARGET_CPU_ARC_ARC_HS
+	default "bf512" if ADK_TARGET_CPU_BFIN_BF512
+	default "bf514" if ADK_TARGET_CPU_BFIN_BF514
+	default "bf516" if ADK_TARGET_CPU_BFIN_BF516
+	default "bf518" if ADK_TARGET_CPU_BFIN_BF518
+	default "bf522" if ADK_TARGET_CPU_BFIN_BF522
+	default "bf523" if ADK_TARGET_CPU_BFIN_BF523
+	default "bf524" if ADK_TARGET_CPU_BFIN_BF524
+	default "bf525" if ADK_TARGET_CPU_BFIN_BF525
+	default "bf526" if ADK_TARGET_CPU_BFIN_BF526
+	default "bf527" if ADK_TARGET_CPU_BFIN_BF527
+	default "bf531" if ADK_TARGET_CPU_BFIN_BF531
+	default "bf532" if ADK_TARGET_CPU_BFIN_BF532
+	default "bf533" if ADK_TARGET_CPU_BFIN_BF533
+	default "bf534" if ADK_TARGET_CPU_BFIN_BF534
+	default "bf536" if ADK_TARGET_CPU_BFIN_BF536
+	default "bf537" if ADK_TARGET_CPU_BFIN_BF537
+	default "bf538" if ADK_TARGET_CPU_BFIN_BF538
+	default "bf539" if ADK_TARGET_CPU_BFIN_BF539
+	default "bf542" if ADK_TARGET_CPU_BFIN_BF542
+	default "bf544" if ADK_TARGET_CPU_BFIN_BF544
+	default "bf547" if ADK_TARGET_CPU_BFIN_BF547
+	default "bf548" if ADK_TARGET_CPU_BFIN_BF548
+	default "bf549" if ADK_TARGET_CPU_BFIN_BF549
+	default "bf542m" if ADK_TARGET_CPU_BFIN_BF542M
+	default "bf544m" if ADK_TARGET_CPU_BFIN_BF544M
+	default "bf547m" if ADK_TARGET_CPU_BFIN_BF547M
+	default "bf548m" if ADK_TARGET_CPU_BFIN_BF548M
+	default "bf549m" if ADK_TARGET_CPU_BFIN_BF549M
+	default "bf561" if ADK_TARGET_CPU_BFIN_BF561
+	default "bf592" if ADK_TARGET_CPU_BFIN_BF592
+	default "cf51" if ADK_TARGET_CPU_CF_51
+	default "cf5206" if ADK_TARGET_CPU_CF_5206
+	default "cf5206e" if ADK_TARGET_CPU_CF_5206E
+	default "cf5208" if ADK_TARGET_CPU_CF_5208
+	default "cf5211a" if ADK_TARGET_CPU_CF_5211A
+	default "cf5213" if ADK_TARGET_CPU_CF_5213
+	default "cf5216" if ADK_TARGET_CPU_CF_5216
+	default "cf52235" if ADK_TARGET_CPU_CF_52235
+	default "cf5225" if ADK_TARGET_CPU_CF_5225
+	default "cf52259" if ADK_TARGET_CPU_CF_52259
+	default "cf5235" if ADK_TARGET_CPU_CF_5235
+	default "cf5249" if ADK_TARGET_CPU_CF_5249
+	default "cf5250" if ADK_TARGET_CPU_CF_5250
+	default "cf5271" if ADK_TARGET_CPU_CF_5271
+	default "cf5272" if ADK_TARGET_CPU_CF_5272
+	default "cf5275" if ADK_TARGET_CPU_CF_5275
+	default "cf5282" if ADK_TARGET_CPU_CF_5282
+	default "cf53017" if ADK_TARGET_CPU_CF_53017
+	default "cf5307" if ADK_TARGET_CPU_CF_5307
+	default "cf5328" if ADK_TARGET_CPU_CF_5328
+	default "cf5329" if ADK_TARGET_CPU_CF_5329
+	default "cf5373" if ADK_TARGET_CPU_CF_5373
+	default "cf5407" if ADK_TARGET_CPU_CF_5407
+	default "cf5475" if ADK_TARGET_CPU_CF_5475
+	default "68020" if ADK_TARGET_CPU_M68K_68020
+	default "68030" if ADK_TARGET_CPU_M68K_68030
+	default "68040" if ADK_TARGET_CPU_M68K_68040
+	default "68060" if ADK_TARGET_CPU_M68K_68060
+	default "cortex_a5" if ADK_TARGET_CPU_ARM_CORTEX_A5
+	default "cortex_a7" if ADK_TARGET_CPU_ARM_CORTEX_A7
+	default "cortex_a8" if ADK_TARGET_CPU_ARM_CORTEX_A8
+	default "cortex_a9" if ADK_TARGET_CPU_ARM_CORTEX_A9
+	default "cortex_a15" if ADK_TARGET_CPU_ARM_CORTEX_A15
+	default "cortex_a17" if ADK_TARGET_CPU_ARM_CORTEX_A17
+	default "cortex_m3" if ADK_TARGET_CPU_ARM_CORTEX_M3
+	default "cortex_m4" if ADK_TARGET_CPU_ARM_CORTEX_M4
+	default "arm1176jzf_s" if ADK_TARGET_CPU_ARM_ARM1176JZF_S
+	default "arm926ej_s" if ADK_TARGET_CPU_ARM_ARM926EJ_S
+	default "mpcore" if ADK_TARGET_CPU_ARM_ARM11MPCORE
+	default "cortex_a53" if ADK_TARGET_CPU_AARCH64_CORTEX_A53
+	default "cortex_a57" if ADK_TARGET_CPU_AARCH64_CORTEX_A57
+	default "mips32" if ADK_TARGET_CPU_MIPS_MIPS32
+	default "mips32r2" if ADK_TARGET_CPU_MIPS_MIPS32R2
+	default "mips32r6" if ADK_TARGET_CPU_MIPS_MIPS32R6
+	default "mips64" if ADK_TARGET_CPU_MIPS64_MIPS64
+	default "mips64r2" if ADK_TARGET_CPU_MIPS64_MIPS64R2
+	default "mips64r6" if ADK_TARGET_CPU_MIPS64_MIPS64R6
+	default "v8" if ADK_TARGET_CPU_SPARC_V8
+	default "v9" if ADK_TARGET_CPU_SPARC64_V9
+	default "leon" if ADK_TARGET_CPU_SPARC_LEON
+	default "dc233c" if ADK_TARGET_CPU_XTENSA_DC233C
+	default "dc232b" if ADK_TARGET_CPU_XTENSA_DC232B
+	default "de212" if ADK_TARGET_CPU_XTENSA_DE212
+	default "fsf" if ADK_TARGET_CPU_XTENSA_FSF
+
+# required for the correct toolchain triple
 config ADK_TARGET_CPU_ARCH
 	string
 	default "aarch64" if ADK_TARGET_ARCH_AARCH64 && ADK_TARGET_LITTLE_ENDIAN
+	default "aarch64_be" if ADK_TARGET_ARCH_AARCH64 && ADK_TARGET_BIG_ENDIAN
 	default "alpha" if ADK_TARGET_ARCH_ALPHA
 	default "arm" if ADK_TARGET_ARCH_ARM && ADK_TARGET_LITTLE_ENDIAN
 	default "armeb" if ADK_TARGET_ARCH_ARM && ADK_TARGET_BIG_ENDIAN
 	default "arc" if ADK_TARGET_ARCH_ARC && ADK_TARGET_LITTLE_ENDIAN
 	default "arceb" if ADK_TARGET_ARCH_ARC && ADK_TARGET_BIG_ENDIAN
-	default "avr32" if ADK_CPU_AVR32
+	default "avr32" if ADK_TARGET_ARCH_AVR32
 	default "bfin" if ADK_TARGET_ARCH_BFIN
-	default "c6x" if ADK_CPU_C6X
-	default "cris" if ADK_CPU_CRIS_V10
-	default "crisv32" if ADK_CPU_CRIS_V32
+	default "c6x" if ADK_TARGET_ARCH_C6X
+	default "cris" if ADK_TARGET_CPU_CRIS_CRISV10
+	default "crisv32" if ADK_TARGET_CPU_CRIS_CRISV32
 	default "frv" if ADK_TARGET_ARCH_FRV
-	default "i486" if ADK_CPU_I486
-	default "i586" if ADK_CPU_I586
-	default "i686" if ADK_CPU_I686
-	default "i586" if ADK_CPU_GEODE
-	default "i686" if ADK_CPU_PENTIUM_M
-	default "i686" if ADK_CPU_ATOM
-	default "i686" if ADK_CPU_ATHLON
+	default "i486" if ADK_TARGET_CPU_I486
+	default "i586" if ADK_TARGET_CPU_I586
+	default "i686" if ADK_TARGET_CPU_I686
+	default "i586" if ADK_TARGET_CPU_GEODE
+	default "i686" if ADK_TARGET_CPU_PENTIUM_M
+	default "i686" if ADK_TARGET_CPU_ATOM
+	default "i686" if ADK_TARGET_CPU_ATHLON
 	default "h8300" if ADK_TARGET_ARCH_H8300
 	default "hppa" if ADK_TARGET_ARCH_HPPA
 	default "ia64" if ADK_TARGET_ARCH_IA64
@@ -1395,19 +1620,19 @@ config ADK_TARGET_CPU_ARCH
 	default "ppc64le" if ADK_TARGET_ARCH_PPC64 && ADK_TARGET_LITTLE_ENDIAN
 	default "ppc64" if ADK_TARGET_ARCH_PPC64 && ADK_TARGET_BIG_ENDIAN
 	default "s390x" if ADK_TARGET_ARCH_S390
-	default "sh2" if ADK_CPU_SH2 && ADK_TARGET_LITTLE_ENDIAN
-	default "sh2eb" if ADK_CPU_SH2 && ADK_TARGET_BIG_ENDIAN
-	default "sh2a" if ADK_CPU_SH2A
-	default "sh3" if ADK_CPU_SH3 && ADK_TARGET_LITTLE_ENDIAN
-	default "sh3eb" if ADK_CPU_SH3 && ADK_TARGET_BIG_ENDIAN
-	default "sh4" if ADK_CPU_SH4 && ADK_TARGET_LITTLE_ENDIAN
-	default "sh4eb" if ADK_CPU_SH4 && ADK_TARGET_BIG_ENDIAN
-	default "sh4a" if ADK_CPU_SH4A && ADK_TARGET_LITTLE_ENDIAN
-	default "sh4aeb" if ADK_CPU_SH4A && ADK_TARGET_BIG_ENDIAN
+	default "sh2" if ADK_TARGET_CPU_SH2 && ADK_TARGET_LITTLE_ENDIAN
+	default "sh2eb" if ADK_TARGET_CPU_SH2 && ADK_TARGET_BIG_ENDIAN
+	default "sh2a" if ADK_TARGET_CPU_SH2A
+	default "sh3" if ADK_TARGET_CPU_SH3 && ADK_TARGET_LITTLE_ENDIAN
+	default "sh3eb" if ADK_TARGET_CPU_SH3 && ADK_TARGET_BIG_ENDIAN
+	default "sh4" if ADK_TARGET_CPU_SH4 && ADK_TARGET_LITTLE_ENDIAN
+	default "sh4eb" if ADK_TARGET_CPU_SH4 && ADK_TARGET_BIG_ENDIAN
+	default "sh4a" if ADK_TARGET_CPU_SH4A && ADK_TARGET_LITTLE_ENDIAN
+	default "sh4aeb" if ADK_TARGET_CPU_SH4A && ADK_TARGET_BIG_ENDIAN
 	default "sparc" if ADK_TARGET_ARCH_SPARC
 	default "sparc64" if ADK_TARGET_ARCH_SPARC64
-	default "tilegx" if ADK_CPU_TILEGX
-	default "tilepro" if ADK_CPU_TILEPRO
+	default "tilegx" if ADK_TARGET_CPU_TILEGX
+	default "tilepro" if ADK_TARGET_CPU_TILEPRO
 	default "v850" if ADK_TARGET_ARCH_V850
 	default "x86_64" if ADK_TARGET_ARCH_X86_64
 	default "xtensa" if ADK_TARGET_ARCH_XTENSA
diff --git a/target/config/Config.in.endian b/target/config/Config.in.endian
index cd1151a4e..07a16d09f 100644
--- a/target/config/Config.in.endian
+++ b/target/config/Config.in.endian
@@ -16,27 +16,20 @@ depends on ADK_TARGET_ARCH_ARC \
 	|| ADK_TARGET_ARCH_XTENSA
 
 config ADK_TARGET_LITTLE_ENDIAN
-	bool "Little endian"
-	depends on !ADK_TARGET_SYSTEM_NUMATO_MIMASV2
-	depends on !ADK_TARGET_SYSTEM_DRAGINO_MS14S
-	depends on !ADK_TARGET_SYSTEM_LINKSYS_NSLU2
-	depends on !ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	depends on !ADK_CPU_SH2A
+	bool "little"
 
 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
-	depends on !ADK_TARGET_SYSTEM_KINETIS_K70
-	
+	bool "big"
+
 endchoice
 
+config ADK_TARGET_ENDIAN_SUFFIX
+	string
+	default "le" if ADK_TARGET_LITTLE_ENDIAN && (ADK_TARGET_ARCH_NDS32 || ADK_TARGET_ARCH_PPC64)
+	default "el" if ADK_TARGET_LITTLE_ENDIAN && (ADK_TARGET_ARCH_MIPS || ADK_TARGET_ARCH_MIPS64 || ADK_TARGET_ARCH_MICROBLAZE)
+	default "be" if ADK_TARGET_BIG_ENDIAN && (ADK_TARGET_ARCH_NDS32 || ADK_TARGET_ARCH_AARCH64)
+	default "eb" if ADK_TARGET_BIG_ENDIAN && (ADK_TARGET_ARCH_ARC || ADK_TARGET_ARM || ADK_TARGET_ARCH_SH)
+
 config ADK_TARGET_ENDIAN
 	string
 	default "little" if ADK_TARGET_LITTLE_ENDIAN
diff --git a/target/config/Config.in.fpu b/target/config/Config.in.fpu
index b3b64bf96..a9ac0d63a 100644
--- a/target/config/Config.in.fpu
+++ b/target/config/Config.in.fpu
@@ -12,13 +12,13 @@ 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
+	default "vfpv3-fp16" if ADK_TARGET_CPU_ARM_CORTEX_A5 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "vfpv4" if ADK_TARGET_CPU_ARM_CORTEX_A7 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "vfpv3" if ADK_TARGET_CPU_ARM_CORTEX_A8 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "vfpv3-fp16" if ADK_TARGET_CPU_ARM_CORTEX_A9 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "vfpv4" if ADK_TARGET_CPU_ARM_CORTEX_A15 && !ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon-fp16" if ADK_TARGET_CPU_ARM_CORTEX_A5 && ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon-vfpv4" if ADK_TARGET_CPU_ARM_CORTEX_A7 && ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon" if ADK_TARGET_CPU_ARM_CORTEX_A8 && ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon-fp16" if ADK_TARGET_CPU_ARM_CORTEX_A9 && ADK_TARGET_ARCH_ARM_WITH_NEON
+	default "neon-vfpv4" if ADK_TARGET_CPU_ARM_CORTEX_A15 && ADK_TARGET_ARCH_ARM_WITH_NEON
diff --git a/target/config/Config.in.kernelversion b/target/config/Config.in.kernelversion
index 9910d78ba..0fe631b2d 100644
--- a/target/config/Config.in.kernelversion
+++ b/target/config/Config.in.kernelversion
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 choice
-prompt "Kernel Version"
-depends on ADK_TARGET_KERNEL_CUSTOMISING
+prompt "Kernel version"
+depends on ADK_TARGET_OS_LINUX
 default ADK_TARGET_KERNEL_VERSION_4_4_3 if ADK_TARGET_ARCH_ARC
 default ADK_TARGET_KERNEL_VERSION_4_4_3 if ADK_TARGET_ARCH_SPARC
 default ADK_TARGET_KERNEL_VERSION_4_4_3 if ADK_TARGET_ARCH_BFIN
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index 6e0f06f6c..91cba9769 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -3,50 +3,75 @@
 
 choice
 prompt "C library"
+default ADK_TARGET_LIB_UCLIBC_NG if ADK_TARGET_OS_LINUX
 
 config ADK_TARGET_LIB_UCLIBC_NG
 	bool "uClibc-ng embedded C library"
-	depends on \
-		   !ADK_TARGET_ARCH_AARCH64 && \
-		   !ADK_TARGET_ARCH_MOXIE && \
-		   !ADK_TARGET_ARCH_NDS32 && \
-		   !ADK_TARGET_ARCH_S390 && \
-		   !ADK_TARGET_ARCH_SPARC64 && \
-		   !ADK_TARGET_ARCH_PPC64 && \
-		   !ADK_TARGET_ARCH_TILE && \
-		   !ADK_TARGET_ARCH_V850
+	depends on (\
+		ADK_TARGET_ARCH_ALPHA || \
+		ADK_TARGET_ARCH_ARC || \
+		ADK_TARGET_ARCH_ARM || \
+		ADK_TARGET_ARCH_AVR32 || \
+		ADK_TARGET_ARCH_BFIN || \
+		ADK_TARGET_ARCH_C6X || \
+		ADK_TARGET_ARCH_CRIS || \
+		ADK_TARGET_ARCH_FRV || \
+		ADK_TARGET_ARCH_H8300 || \
+		ADK_TARGET_ARCH_HPPA || \
+		ADK_TARGET_ARCH_IA64 || \
+		ADK_TARGET_ARCH_LM32 || \
+		ADK_TARGET_ARCH_M68K || \
+		ADK_TARGET_ARCH_METAG || \
+		ADK_TARGET_ARCH_MICROBLAZE || \
+		ADK_TARGET_ARCH_MIPS || \
+		ADK_TARGET_ARCH_MIPS64 || \
+		ADK_TARGET_ARCH_NIOS2 || \
+		ADK_TARGET_ARCH_OR1K || \
+		ADK_TARGET_ARCH_PPC || \
+		ADK_TARGET_ARCH_SH || \
+		ADK_TARGET_ARCH_SPARC || \
+		ADK_TARGET_ARCH_X86 || \
+		ADK_TARGET_ARCH_X86_64 || \
+		ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_OS_LINUX
 	help
 	  http://uclibc-ng.org
 
 config ADK_TARGET_LIB_MUSL
 	bool "musl C library"
-	depends on !ADK_TARGET_UCLINUX
-	depends on \
+	depends on (\
 		ADK_TARGET_ARCH_AARCH64 || \
 		ADK_TARGET_ARCH_ARM || \
 		ADK_TARGET_ARCH_MICROBLAZE || \
 		ADK_TARGET_ARCH_MIPS || \
+		ADK_TARGET_ARCH_MIPS64 || \
 		ADK_TARGET_ARCH_OR1K || \
 		ADK_TARGET_ARCH_PPC || \
 		ADK_TARGET_ARCH_SH || \
 		ADK_TARGET_ARCH_X86 || \
-		ADK_TARGET_ARCH_X86_64
+		ADK_TARGET_ARCH_X86_64) && ADK_TARGET_OS_LINUX
 	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_MOXIE
-	depends on !ADK_TARGET_ARCH_NDS32
-	depends on !ADK_TARGET_ARCH_SPARC
-	depends on !ADK_TARGET_ARCH_XTENSA
-	depends on !ADK_TARGET_UCLINUX
-	depends on !ADK_TARGET_WITHOUT_MMU
+	depends on (\
+		ADK_TARGET_ARCH_AARCH64 || \
+		ADK_TARGET_ARCH_ALPHA || \
+		ADK_TARGET_ARCH_ARM || \
+		ADK_TARGET_ARCH_HPPA || \
+		ADK_TARGET_ARCH_IA64 || \
+		ADK_TARGET_ARCH_MICROBLAZE || \
+		ADK_TARGET_ARCH_MIPS || \
+		ADK_TARGET_ARCH_MIPS64 || \
+		ADK_TARGET_ARCH_NIOS2 || \
+		ADK_TARGET_ARCH_PPC || \
+		ADK_TARGET_ARCH_PPC64 || \
+		ADK_TARGET_ARCH_S390 || \
+		ADK_TARGET_ARCH_SH || \
+		ADK_TARGET_ARCH_SPARC64 || \
+		ADK_TARGET_ARCH_TILE || \
+		ADK_TARGET_ARCH_X86 || \
+		ADK_TARGET_ARCH_X86_64) && ADK_TARGET_OS_LINUX
 	help
 	  http://www.gnu.org/libc
 
@@ -54,7 +79,7 @@ config ADK_TARGET_LIB_NEWLIB
 	bool "newlib C library"
 	select ADK_TARGET_WITHOUT_CXX
 	select ADK_TARGET_WITHOUT_THREADS
-	depends on \
+	depends on (\
 		ADK_TARGET_ARCH_AARCH64 || \
 		ADK_TARGET_ARCH_ARC || \
 		ADK_TARGET_ARCH_ARM || \
@@ -65,14 +90,15 @@ config ADK_TARGET_LIB_NEWLIB
 		ADK_TARGET_ARCH_LM32 || \
 		ADK_TARGET_ARCH_MICROBLAZE || \
 		ADK_TARGET_ARCH_MIPS || \
-		ADK_TARGET_ARCH_NIOS2 || \
 		ADK_TARGET_ARCH_MOXIE || \
+		ADK_TARGET_ARCH_NIOS2 || \
 		ADK_TARGET_ARCH_NDS32 || \
 		ADK_TARGET_ARCH_OR1K || \
 		ADK_TARGET_ARCH_PPC || \
 		ADK_TARGET_ARCH_SPARC || \
 		ADK_TARGET_ARCH_V850 || \
-		ADK_TARGET_ARCH_X86
+		ADK_TARGET_ARCH_X86 || \
+		ADK_TARGET_ARCH_XTENSA) && ADK_TARGET_OS_BAREMETAL
 	help
 	  https://sourceware.org/newlib/
 
diff --git a/target/config/Config.in.mips b/target/config/Config.in.mips
deleted file mode 100644
index 4a23e3cb1..000000000
--- a/target/config/Config.in.mips
+++ /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.
-
-choice ADK_TARGET_MIPS_CPU_ARCH
-prompt "ISA configuration"
-depends on ADK_TARGET_ARCH_MIPS && ADK_TARGET_SYSTEM_QEMU_MIPS
-default ADK_CPU_MIPS_MIPS32R2
-
-config ADK_CPU_MIPS_MIPS32R6
-        bool "MIPS32r6"
-        select ADK_CPU_MIPS32R6
-
-config ADK_CPU_MIPS_MIPS32R2
-        bool "MIPS32r2"
-        select ADK_CPU_MIPS32R2
-
-config ADK_CPU_MIPS_MIPS32
-        bool "MIPS32"
-        select ADK_CPU_MIPS32
-
-endchoice
-
-choice ADK_TARGET_MIPS64_CPU_ARCH
-prompt "ISA configuration"
-depends on ADK_TARGET_ARCH_MIPS64 && ADK_TARGET_SYSTEM_QEMU_MIPS64
-default ADK_CPU_MIPS_MIPS64R2
-
-config ADK_CPU_MIPS_MIPS64R6
-        bool "MIPS64r6"
-        select ADK_CPU_MIPS32R6
-
-config ADK_CPU_MIPS_MIPS64R2
-        bool "MIPS64r2"
-        select ADK_CPU_MIPS64R2
-
-config ADK_CPU_MIPS_MIPS64
-        bool "MIPS64"
-        select ADK_CPU_MIPS64
-
-endchoice
diff --git a/target/config/Config.in.os b/target/config/Config.in.os
new file mode 100644
index 000000000..1d21d09e8
--- /dev/null
+++ b/target/config/Config.in.os
@@ -0,0 +1,17 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+choice
+prompt "Operating System"
+
+config ADK_TARGET_OS_LINUX
+	bool "Linux"
+	help
+	  Create a Linux system or toolchain.
+
+config ADK_TARGET_OS_BAREMETAL
+	bool "Bare metal"
+	help
+	  Create a bare metal appliance or toolchain.
+
+endchoice
diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts
index 4ef3aa1aa..c26f3113b 100644
--- a/target/config/Config.in.qemuopts
+++ b/target/config/Config.in.qemuopts
@@ -1,6 +1,9 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+menu "Qemu system configuration"
+depends on ADK_TARGET_QEMU && !ADK_TARGET_SYSTEM_QEMU_XTENSA
+
 config ADK_QEMU_ARGS
 	string
 	default "" if ADK_TARGET_QEMU_WITH_GRAPHIC
@@ -135,3 +138,4 @@ config ADK_TARGET_QEMU_WITH_AUDIO
 	bool "enabled"
 
 endchoice
+endmenu
diff --git a/target/config/Config.in.rootfs b/target/config/Config.in.rootfs
index b9f7023df..bf4b6c1cc 100644
--- a/target/config/Config.in.rootfs
+++ b/target/config/Config.in.rootfs
@@ -2,8 +2,8 @@
 # material, please see the LICENCE file in the top-level directory.
 
 choice
-prompt "Root filesystem type"
-depends on !ADK_TARGET_TOOLCHAIN
+prompt "Firmware type"
+depends on !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_OS_BAREMETAL
 default ADK_TARGET_ROOTFS_ARCHIVE
 
 config ADK_TARGET_ROOTFS_INITRAMFS
@@ -149,30 +149,30 @@ config ADK_TARGET_ROOTFS_ARCHIVE
 endchoice
 
 choice
-prompt "Root filesystem type"
+prompt "Root filesystem"
 depends on ADK_TARGET_ROOTFS_ARCHIVE || ADK_TARGET_ROOTFS_USB && !ADK_TARGET_QEMU
 default ADK_TARGET_ROOT_EXT4
 
 config ADK_TARGET_ROOT_EXT4
-	bool "EXT4 filesystem"
+	bool "EXT4"
 	select ADK_KERNEL_EXT4_FS
 	help
 	  Compile EXT4 filesystem into kernel and use it as root filesystem.
 
 config ADK_TARGET_ROOT_XFS
-	bool "XFS filesystem"
+	bool "XFS"
 	select ADK_KERNEL_XFS_FS
 	help
 	  Compile XFS filesystem into kernel and use it as root filesystem.
 
 config ADK_TARGET_ROOT_EXT2
-	bool "EXT2 filesystem"
+	bool "EXT2"
 	select ADK_KERNEL_EXT2_FS
 	help
 	  Compile EXT2 filesystem into kernel and use it as root filesystem.
 
 config ADK_TARGET_ROOT_EXT3
-	bool "EXT3 filesystem"
+	bool "EXT3"
 	select ADK_KERNEL_EXT3_FS
 	help
 	  Compile EXT3 filesystem into kernel and use it as root filesystem.
diff --git a/target/config/Config.in.systemopts b/target/config/Config.in.systemopts
new file mode 100644
index 000000000..e0b77042d
--- /dev/null
+++ b/target/config/Config.in.systemopts
@@ -0,0 +1,38 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+choice
+prompt "GPU memory size"
+depends on ADK_TARGET_BOARD_BCM28XX
+default ADK_TARGET_GPU_MEM_256 if ADK_PACKAGE_KODI
+
+config ADK_TARGET_GPU_MEM_16
+       bool "16"
+       help
+         use minimal 16 MB.
+
+config ADK_TARGET_GPU_MEM_64
+       bool "64"
+       help
+         use 64 MB.
+
+config ADK_TARGET_GPU_MEM_128
+       bool "128"
+       help
+         use 128 MB.
+
+config ADK_TARGET_GPU_MEM_256
+       bool "256"
+       help
+         use 256 MB.
+
+endchoice
+
+config ADK_TARGET_GPU_MEM
+       int
+       default 16 if ADK_TARGET_GPU_MEM_16
+       default 64 if ADK_TARGET_GPU_MEM_64
+       default 128 if ADK_TARGET_GPU_MEM_128
+       default 256 if ADK_TARGET_GPU_MEM_256
+       depends on ADK_TARGET_BOARD_BCM28XX
+
diff --git a/target/config/Config.in.target b/target/config/Config.in.target
index 8500a4933..ec72d1b44 100644
--- a/target/config/Config.in.target
+++ b/target/config/Config.in.target
@@ -7,74 +7,6 @@ config ADK_TARGET_CMDLINE
 	default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C
 	default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70
 	default "metag_da.console_poll=1" if ADK_TARGET_SYSTEM_QEMU_METAG
-	default "earlycon=uart8250,mmio32,0x9d050020,115200n8 console=ttyS0,115200n8" if ADK_TARGET_XTENSA_DE212
+	default "earlycon=uart8250,mmio32,0x9d050020,115200n8 console=ttyS0,115200n8" if ADK_TARGET_CPU_XTENSA_DE212
 	default ""
 
-config ADK_PACKAGE_SUFFIX
-	string
-	default "ipk" if ADK_TARGET_PACKAGE_IPKG
-	default "ipk" if ADK_TARGET_PACKAGE_OPKG
-	default "tar.xz" if ADK_TARGET_PACKAGE_TXZ
-	help
-
-choice
-prompt "Package format"
-default ADK_TARGET_PACKAGE_TXZ
-
-config ADK_TARGET_PACKAGE_TXZ
-	bool "xz compressed tar archive"
-	help
-	  Create compressed tar archives of packages.
-	  Pre- and post install scripts will be executed in the target
-	  directory. There will be no package manager installed onto the target.
-
-config ADK_TARGET_PACKAGE_IPKG
-	bool "ipkg"
-	select BUSYBOX_IPKG
-	help
-	  Create ipkg packages and use ipkg package management on the target.
-
-config ADK_TARGET_PACKAGE_OPKG
-	bool "opkg"
-	select ADK_PACKAGE_OPKG
-	select ADK_HOST_NEED_OPKG
-	help
-	  Create opkg packages and use opkg package management on the target.
-	  
-endchoice
-
-choice
-prompt "GPU memory size"
-depends on ADK_TARGET_BOARD_BCM28XX
-default ADK_TARGET_GPU_MEM_256 if ADK_PACKAGE_KODI
-
-config ADK_TARGET_GPU_MEM_16
-	bool "16"
-	help
-	  use minimal 16 MB.
-
-config ADK_TARGET_GPU_MEM_64
-	bool "64"
-	help
-	  use 64 MB.
-
-config ADK_TARGET_GPU_MEM_128
-	bool "128"
-	help
-	  use 128 MB.
-
-config ADK_TARGET_GPU_MEM_256
-	bool "256"
-	help
-	  use 256 MB.
-
-endchoice
-
-config ADK_TARGET_GPU_MEM
-	int
-	default 16 if ADK_TARGET_GPU_MEM_16
-	default 64 if ADK_TARGET_GPU_MEM_64
-	default 128 if ADK_TARGET_GPU_MEM_128
-	default 256 if ADK_TARGET_GPU_MEM_256
-	depends on ADK_TARGET_BOARD_BCM28XX
-
diff --git a/target/config/Config.in.tc b/target/config/Config.in.tc
deleted file mode 100644
index 59352e8d6..000000000
--- a/target/config/Config.in.tc
+++ /dev/null
@@ -1,675 +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_CPU
-prompt "CPU type"
-depends on (ADK_TARGET_TOOLCHAIN || ADK_TARGET_SIM || ADK_TARGET_SYSTEM_GENERIC_X86_64) && \
-	( ADK_TARGET_ARCH_CRIS \
-	|| ADK_TARGET_ARCH_AARCH64 \
-	|| ADK_TARGET_ARCH_ARC \
-	|| ADK_TARGET_ARCH_ARM \
-	|| ADK_TARGET_ARCH_BFIN \
-	|| ADK_TARGET_ARCH_M68K \
-	|| ADK_TARGET_ARCH_MIPS \
-	|| ADK_TARGET_ARCH_MIPS64 \
-	|| ADK_TARGET_ARCH_PPC64 \
-	|| ADK_TARGET_ARCH_SH \
-	|| ADK_TARGET_ARCH_SPARC \
-	|| ADK_TARGET_ARCH_TILE \
-	|| ADK_TARGET_ARCH_X86 \
-	|| ADK_TARGET_ARCH_X86_64 )
-
-config ADK_TARGET_CPU_ARC_ARC700
-	bool "ARC700 (ARCv1)"
-	select ADK_CPU_ARC700
-	depends on ADK_TARGET_ARCH_ARC
-
-config ADK_TARGET_CPU_ARC_ARC_HS
-	bool "ARC HS (ARCv2)"
-	select ADK_CPU_ARC_HS
-	depends on ADK_TARGET_ARCH_ARC
-
-config ADK_TARGET_CPU_ARM_CORTEX_A53
-        bool "cortex-a53"
-        select ADK_CPU_CORTEX_A53
-	depends on ADK_TARGET_ARCH_AARCH64
-
-config ADK_TARGET_CPU_ARM_CORTEX_A57
-        bool "cortex-a57"
-        select ADK_CPU_CORTEX_A57
-	depends on ADK_TARGET_ARCH_AARCH64
-
-config ADK_TARGET_CPU_ARM_CORTEX_A9
-        bool "cortex-a9"
-        select ADK_CPU_CORTEX_A9
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_CORTEX_A8
-        bool "cortex-a8"
-        select ADK_CPU_CORTEX_A8
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_CORTEX_A7
-        bool "cortex-a7"
-        select ADK_CPU_CORTEX_A7
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_CORTEX_A5
-        bool "cortex-a5"
-        select ADK_CPU_CORTEX_A5
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_CORTEX_A15
-        bool "cortex-a15"
-        select ADK_CPU_CORTEX_A15
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_CORTEX_A17
-        bool "cortex-a17"
-        select ADK_CPU_CORTEX_A17
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_CORTEX_M4
-	bool "cortex-m4"
-	select ADK_CPU_CORTEX_M4
-	select ADK_TARGET_ARCH_ARM_WITH_THUMB
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_CORTEX_M3
-	bool "cortex-m3"
-	select ADK_CPU_CORTEX_M3
-	select ADK_TARGET_ARCH_ARM_WITH_THUMB
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_ARM1176JZF_S
-        bool "arm1176jzf-s"
-        select ADK_CPU_ARM1176JZF_S
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_ARM926EJ_S
-        bool "arm926ej-s"
-        select ADK_CPU_ARM926EJ_S
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_ARM_XSCALE
-        bool "xscale"
-        select ADK_CPU_XSCALE
-	depends on ADK_TARGET_ARCH_ARM
-
-config ADK_TARGET_CPU_BFIN_BF512
-        bool "bf512"
-        select ADK_CPU_BF512
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF514
-        bool "bf514"
-        select ADK_CPU_BF514
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF516
-        bool "bf516"
-        select ADK_CPU_BF516
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF518
-        bool "bf518"
-        select ADK_CPU_BF518
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF522
-        bool "bf522"
-        select ADK_CPU_BF522
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF523
-        bool "bf523"
-        select ADK_CPU_BF523
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF524
-        bool "bf524"
-        select ADK_CPU_BF524
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF525
-        bool "bf525"
-        select ADK_CPU_BF525
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF526
-        bool "bf526"
-        select ADK_CPU_BF526
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF527
-        bool "bf527"
-        select ADK_CPU_BF527
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF531
-        bool "bf531"
-        select ADK_CPU_BF531
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF532
-        bool "bf532"
-        select ADK_CPU_BF532
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF533
-        bool "bf533"
-        select ADK_CPU_BF533
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF534
-        bool "bf534"
-        select ADK_CPU_BF534
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF536
-        bool "bf536"
-        select ADK_CPU_BF536
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF537
-        bool "bf537"
-        select ADK_CPU_BF537
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF538
-        bool "bf538"
-        select ADK_CPU_BF538
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF539
-        bool "bf539"
-        select ADK_CPU_BF539
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF542
-        bool "bf542"
-        select ADK_CPU_BF542
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF544
-        bool "bf544"
-        select ADK_CPU_BF544
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF547
-        bool "bf547"
-        select ADK_CPU_BF547
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF548
-        bool "bf548"
-        select ADK_CPU_BF548
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF549
-        bool "bf549"
-        select ADK_CPU_BF549
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF542M
-        bool "bf542m"
-        select ADK_CPU_BF542M
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF544M
-        bool "bf544m"
-        select ADK_CPU_BF544M
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF547M
-        bool "bf547m"
-        select ADK_CPU_BF547M
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF548M
-        bool "bf548m"
-        select ADK_CPU_BF548M
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF549M
-        bool "bf549m"
-        select ADK_CPU_BF549M
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF561
-        bool "bf561"
-        select ADK_CPU_BF561
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_BFIN_BF592
-        bool "bf592"
-        select ADK_CPU_BF592
-	depends on ADK_TARGET_ARCH_BFIN
-
-config ADK_TARGET_CPU_CRIS_CRISV10
-	bool "cris v10"
-        select ADK_CPU_CRIS_V10
-	depends on ADK_TARGET_ARCH_CRIS
-
-config ADK_TARGET_CPU_CRIS_CRISV32
-	bool "cris v32"
-        select ADK_CPU_CRIS_V32
-	depends on ADK_TARGET_ARCH_CRIS
-
-config ADK_TARGET_CPU_CF_51
-	bool "coldfire 51"
-	select ADK_CPU_CF_51
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5206
-	bool "coldfire 5206"
-	select ADK_CPU_CF_5206
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5206E
-	bool "coldfire 5206e"
-	select ADK_CPU_CF_5206E
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5208
-	bool "coldfire 5208"
-	select ADK_CPU_CF_5208
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5211A
-	bool "coldfire 5211a"
-	select ADK_CPU_CF_5211A
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5213
-	bool "coldfire 5213"
-	select ADK_CPU_CF_5213
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5216
-	bool "coldfire 5216"
-	select ADK_CPU_CF_5216
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_52235
-	bool "coldfire 52235"
-	select ADK_CPU_CF_52235
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5225
-	bool "coldfire 5225"
-	select ADK_CPU_CF_5225
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_52259
-	bool "coldfire 52259"
-	select ADK_CPU_CF_52259
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5235
-	bool "coldfire 5235"
-	select ADK_CPU_CF_5235
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5249
-	bool "coldfire 5249"
-	select ADK_CPU_CF_5249
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5250
-	bool "coldfire 5250"
-	select ADK_CPU_CF_5250
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5271
-	bool "coldfire 5271"
-	select ADK_CPU_CF_5271
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5272
-	bool "coldfire 5272"
-	select ADK_CPU_CF_5272
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5275
-	bool "coldfire 5275"
-	select ADK_CPU_CF_5275
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5282
-	bool "coldfire 5282"
-	select ADK_CPU_CF_5282
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_53017
-	bool "coldfire 53017"
-	select ADK_CPU_CF_53017
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5307
-	bool "coldfire 5307"
-	select ADK_CPU_CF_5307
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5328
-	bool "coldfire 5328"
-	select ADK_CPU_CF_5328
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5329
-	bool "coldfire 5329"
-	select ADK_CPU_CF_5329
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5373
-	bool "coldfire 5373"
-	select ADK_CPU_CF_5373
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5407
-	bool "coldfire 5407"
-	select ADK_CPU_CF_5407
-	select ADK_TARGET_UCLINUX
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_CF_5475
-	bool "coldfire 5475"
-	select ADK_CPU_CF_5475
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_M68K_68020
-	bool "m68k 68020"
-	select ADK_CPU_68020
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_M68K_68030
-	bool "m68k 68030"
-	select ADK_CPU_68030
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_M68K_68040
-	bool "m68k 68040"
-	select ADK_CPU_68040
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_M68K_68060
-	bool "m68k 68060"
-	select ADK_CPU_68060
-	depends on ADK_TARGET_ARCH_M68K
-
-config ADK_TARGET_CPU_MIPS_MIPS32
-	bool "mips32"
-	select ADK_CPU_MIPS32
-	depends on ADK_TARGET_ARCH_MIPS
-
-config ADK_TARGET_CPU_MIPS_MIPS32R2
-	bool "mips32r2"
-	select ADK_CPU_MIPS32R2
-	depends on ADK_TARGET_ARCH_MIPS
-
-config ADK_TARGET_CPU_MIPS_MIPS32R6
-	bool "mips32r6"
-	select ADK_CPU_MIPS32R6
-	depends on ADK_TARGET_ARCH_MIPS
-
-config ADK_TARGET_CPU_MIPS_MIPS64
-	bool "mips64"
-	select ADK_CPU_MIPS64
-	depends on ADK_TARGET_ARCH_MIPS64
-
-config ADK_TARGET_CPU_MIPS_MIPS64R2
-	bool "mips64r2"
-	select ADK_CPU_MIPS64R2
-	depends on ADK_TARGET_ARCH_MIPS64
-
-config ADK_TARGET_CPU_MIPS_MIPS64R6
-	bool "mips64r6"
-	select ADK_CPU_MIPS64R6
-	depends on ADK_TARGET_ARCH_MIPS64
-
-config ADK_TARGET_CPU_PPC64_POWER6
-	bool "power6"
-	select ADK_CPU_POWER6
-	depends on ADK_TARGET_ARCH_PPC64
-
-config ADK_TARGET_CPU_PPC64_POWER7
-	bool "power7"
-	select ADK_CPU_POWER7
-	depends on ADK_TARGET_ARCH_PPC64
-
-config ADK_TARGET_CPU_PPC64_POWER8
-	bool "power8"
-	select ADK_CPU_POWER8
-	depends on ADK_TARGET_ARCH_PPC64
-
-config ADK_TARGET_CPU_SH_SH2
-	bool "sh2"
-	select ADK_CPU_SH2
-	depends on ADK_TARGET_ARCH_SH
-
-config ADK_TARGET_CPU_SH_SH2A
-	bool "sh2a"
-	select ADK_CPU_SH2A
-	depends on ADK_TARGET_ARCH_SH
-
-config ADK_TARGET_CPU_SH_SH3
-	bool "sh3"
-	select ADK_CPU_SH3
-	depends on ADK_TARGET_ARCH_SH
-
-config ADK_TARGET_CPU_SH_SH4
-	bool "sh4"
-	select ADK_CPU_SH4
-	depends on ADK_TARGET_ARCH_SH
-
-config ADK_TARGET_CPU_SH_SH4A
-	bool "sh4a"
-	select ADK_CPU_SH4A
-	depends on ADK_TARGET_ARCH_SH
-
-config ADK_TARGET_CPU_SPARC_V8
-	bool "v8"
-	select ADK_CPU_SPARC_V8
-	depends on ADK_TARGET_ARCH_SPARC
-
-config ADK_TARGET_CPU_SPARC_LEON
-	bool "leon"
-	select ADK_CPU_SPARC_LEON
-	depends on ADK_TARGET_ARCH_SPARC
-
-config ADK_TARGET_CPU_TILE_TILEGX
-	bool "tilegx"
-	select ADK_CPU_TILEGX
-	depends on ADK_TARGET_ARCH_TILE
-
-config ADK_TARGET_CPU_TILE_TILEPRO
-	bool "tilepro"
-	select ADK_CPU_TILEPRO
-	depends on ADK_TARGET_ARCH_TILE
-
-config ADK_TARGET_CPU_X86_I486
-	bool "i486"
-	select ADK_CPU_I486
-	depends on ADK_TARGET_ARCH_X86
-
-config ADK_TARGET_CPU_X86_I586
-	bool "i586"
-	select ADK_CPU_I586
-	depends on ADK_TARGET_ARCH_X86
-
-config ADK_TARGET_CPU_X86_I686
-	bool "i686"
-	select ADK_CPU_I686
-	depends on ADK_TARGET_ARCH_X86
-
-config ADK_TARGET_CPU_X86_GEODE
-	bool "geode"
-	select ADK_CPU_GEODE
-	depends on ADK_TARGET_ARCH_X86
-
-config ADK_TARGET_CPU_X86_ATOM
-	bool "atom"
-	select ADK_CPU_ATOM
-	depends on ADK_TARGET_ARCH_X86
-
-config ADK_TARGET_CPU_X86_64_X86_64
-	bool "Generic x86_64"
-	select ADK_CPU_X86_64
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_ATHLON_FX
-	bool "Athlon 64 FX"
-	select ADK_CPU_ATHLON_FX
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_ATHLON_64
-	bool "Athlon 64"
-	select ADK_CPU_ATHLON_64
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_ATHLON_64_SSE3
-	bool "Athlon 64 with SSE3"
-	select ADK_CPU_ATHLON_64_SSE3
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BARCELONA
-	bool "Barcelona"
-	select ADK_CPU_BARCELONA
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BDVER1
-	bool "bdver1"
-	select ADK_CPU_BDVER1
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BDVER2
-	bool "bdver2"
-	select ADK_CPU_BDVER2
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BDVER3
-	bool "bdver3"
-	select ADK_CPU_BDVER3
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BDVER4
-	bool "bdver4"
-	select ADK_CPU_BDVER4
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BONNELL
-	bool "Bonnell"
-	select ADK_CPU_BONNELL
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BROADWELL
-	bool "Broadwell"
-	select ADK_CPU_BROADWELL
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BTVER1
-	bool "btver1"
-	select ADK_CPU_BTVER1
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_BTVER2
-	bool "btver2"
-	select ADK_CPU_BTVER1
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_CORE2
-	bool "Core 2"
-	select ADK_CPU_CORE2
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_HASWELL
-	bool "Haswell"
-	select ADK_CPU_HASWELL
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_IVYBRIDGE
-	bool "Ivybridge"
-	select ADK_CPU_IVYBRIDGE
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_K8
-	bool "K8"
-	select ADK_CPU_K8
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_K8_SSE3
-	bool "K8 with SSE3"
-	select ADK_CPU_K8_SSE3
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_KNL
-	bool "knl"
-	select config ADK_CPU_KNL
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_NEHALEM
-	bool "Nehalem"
-	select ADK_CPU_NEHALEM
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_OPTERON
-	bool "Opteron"
-	select ADK_CPU_OPTERON
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_OPTERON_SSE3
-	bool "Opteron with SSE3"
-	select ADK_CPU_OPTERON_SSE3
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_SANDYBRIDGE
-	bool "Sandybridge"
-	select ADK_CPU_SANDYBRIDGE
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_SILVERMONT
-	bool "Silvermont"
-	select ADK_CPU_SILVERMONT
-	depends on ADK_TARGET_ARCH_X86_64
-
-config ADK_TARGET_CPU_X86_64_WESTMERE
-	bool "Westmere"
-	select ADK_CPU_WESTMERE
-	depends on ADK_TARGET_ARCH_X86_64
-
-endchoice
-
-choice
-prompt "Toolchain options"
-depends on ADK_TARGET_TOOLCHAIN
-config ADK_TOOLCHAIN_ONLY
-	bool "Only build toolchain and selected packages"
-
-config ADK_TOOLCHAIN_ARCHIVE
-	bool "Build a complete system usable f.e. via chroot"
-
-endchoice
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 5df860575..098648a56 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -2,10 +2,14 @@
 # material, please see the LICENCE file in the top-level directory.
 
 choice
+depends on ADK_TARGET_OS_LINUX
 prompt "Iconv implementation"
 bool
 default ADK_TARGET_WITHOUT_ICONV if ADK_TARGET_WITHOUT_MMU
-default ADK_TARGET_LIBICONV_TINY if ADK_TARGET_LIB_UCLIBC_NG
+
+config ADK_TARGET_LIBICONV_TINY
+	prompt "Use tiny libiconv package"
+	select ADK_PACKAGE_LIBICONV_TINY
 
 config ADK_TARGET_LIBC_ICONV
 	prompt "Use iconv from C library"
@@ -14,10 +18,6 @@ config ADK_TARGET_LIBICONV
 	prompt "Use libiconv package"
 	select ADK_PACKAGE_LIBICONV
 
-config ADK_TARGET_LIBICONV_TINY
-	prompt "Use tiny libiconv package"
-	select ADK_PACKAGE_LIBICONV_TINY
-
 config ADK_TARGET_WITHOUT_ICONV
 	prompt "Do not build any iconv code"
 
@@ -126,4 +126,15 @@ config ADK_STATIC_TOOLCHAIN
 	help
 	  If you want to create more portable toolchains, build them static.
 
+config ADK_PRELINK
+	bool "Prelink binaries and libraries in Image"
+	depends on ADK_TARGET_OS_LINUX
+	help
+	  Do prelinking for faster loading of binaries.
+
+config ADK_PRELINK_OPTS
+	string "additional options to pass to prelink"
+	default "-mR"
+	depends on ADK_PRELINK
+
 endmenu
diff --git a/target/config/Config.in.x86_64 b/target/config/Config.in.x86_64
deleted file mode 100644
index 748860e68..000000000
--- a/target/config/Config.in.x86_64
+++ /dev/null
@@ -1,15 +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_CPU
-prompt "CPU type"
-depends on ADK_TARGET_SYSTEM_GENERIC_X86_64
-default ADK_TARGET_CPU_X86_64
-help
-  Selection of x86_64 CPU type which gives gcc optimization.
-  For details on the different types, see:
-  https://gcc.gnu.org/onlinedocs/gcc-5.3.0/gcc/x86-Options.html#x86-Options
-
-
-endchoice
-
diff --git a/target/config/Config.in.xtensa b/target/config/Config.in.xtensa
deleted file mode 100644
index 4e62b09d4..000000000
--- a/target/config/Config.in.xtensa
+++ /dev/null
@@ -1,49 +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_TARGET_KERNEL_ZIMAGE
-	select ADK_KERNEL_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-
-config ADK_TARGET_XTENSA_DC232B
-	bool "dc232b"
-	select ADK_KERNEL_XTENSA_VARIANT_DC232B
-	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-
-config ADK_TARGET_XTENSA_FSF
-	bool "fsf"
-	select ADK_KERNEL_XTENSA_VARIANT_FSF
-	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_TARGET_BIG_ENDIAN
-	select ADK_TARGET_WITH_NPTL
-	select ADK_TARGET_WITH_MMU
-
-config ADK_TARGET_XTENSA_DE212
-	bool "de212"
-	select ADK_KERNEL_XTENSA_VARIANT_CUSTOM
-	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_WITH_LT
-	select ADK_TARGET_WITHOUT_MMU
-	select ADK_TARGET_UCLINUX
-
-endchoice
-
-config ADK_TARGET_XTENSA
-	string
-	default "dc233c" if ADK_TARGET_XTENSA_DC233C
-	default "dc232b" if ADK_TARGET_XTENSA_DC232B
-	default "fsf" if ADK_TARGET_XTENSA_FSF
-	default "de212" if ADK_TARGET_XTENSA_DE212