rework menu based config system

After the addition of bare metal toolchains the menu system allowed
to create non-valid configurations. I reworked it so we can also
add other operating system support if we wish.
So first you choose your operating system, then your architecture
and endianess, after that your embedded system, emulator or
generic device and then you choose your task you want to run.

Tasks may be toolchain, a new appliance/application or some preconfigured
sets of packages and configurations as kodi, mpd, firefox and more.
The tasks are limited to a plausible choice of hardware and software.

Deduplicate CPU configuration.

You don't wanna compile Kodi for a H8/300 microcontroller ;)

158 files changed, 1595 insertions, 2412 deletions

diff --git a/.gitignore b/.gitignore
index f5fa5dac6..c1a6e521e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,9 +50,13 @@
 /extra/
 /target/*/Config.in.arch
 /target/*/Config.in.systems
-/target/config/Config.in.appliances
-/target/config/Config.in.system*
-/target/config/Config.in.arch*
+/target/config/Config.in.tasks
+/target/config/Config.in.system
+/target/config/Config.in.system.choice
+/target/config/Config.in.system.default
+/target/config/Config.in.arch
+/target/config/Config.in.arch.choice
+/target/config/Config.in.arch.default
 /target/config/Config.in.scripts
 /target/config/Config.in.prereq
 /target/m68k/aranym.cfg
diff --git a/Config.in b/Config.in
index 2eb75d661..5f383e61e 100644
--- a/Config.in
+++ b/Config.in
@@ -13,95 +13,47 @@ config ADK_HAVE_DOT_CONFIG
 	bool
 	default y
 
-source "target/config/Config.in.appliances"
-
-menu "Target configuration"
-	visible if !ADK_CHOOSE_APPLIANCE
-
-source "target/config/Config.in.cpu"
+source "target/config/Config.in.os"
 source "target/config/Config.in.hardware"
 source "target/config/Config.in.boards"
 source "target/config/Config.in.kernelfmt"
 source "target/config/Config.in.arch"
+source "target/config/Config.in.endian"
+source "target/config/Config.in.archopts"
 source "target/config/Config.in.system"
+source "target/config/Config.in.systemopts"
 source "target/config/Config.in.subsystem"
-source "target/config/Config.in.tc"
-source "target/config/Config.in.xtensa"
 source "target/config/Config.in.qemuopts"
+source "target/config/Config.in.cpu"
+source "target/config/Config.in.tasks"
 source "target/config/Config.in.rootfs"
 source "target/config/Config.in.target"
 
-endmenu
-
 source "target/config/Config.in"
 
 menu "Package selection"
-	visible if !ADK_CHOOSE_APPLIANCE
-
+	visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN
 source "package/Config.in.auto.global"
 source "package/Config.in"
-
 menu "Package options"
-	visible if !ADK_CHOOSE_APPLIANCE
-
-config ADK_LEAVE_ETC_ALONE
-	bool "do not install anything into /etc"
-	default n
-	help
-	  Enabling this option will prevent the ADK from installing anything
-	  into /etc. This is useful for highly customised setups with custom
-	  base-files packages.
-
-	  Package Makefiles can override this setting by passing "force_etc" to
-	  the package-template.  to a non-empty value. This is useful for
-	  packages traditionally installing non-config stuff into /etc, like
-	  e.g. ca-certificates.
-
-	  Note that without further customisation, turning this option
-	  on will almost certainly render the resulting system unusable.
-
-config ADK_INSTALL_PACKAGE_INIT_SCRIPTS
-	bool "ship custom init-scripts along with packages"
-	default y
-	depends on !ADK_LEAVE_ETC_ALONE
-	help
-	  Turning this option to false will prevent the ADK from
-	  installing init-scripts (i.e. files in /etc/init.d) for
-	  certain daemons and daemon-like applications.
-
-	  Note that without further customisation, turning this option
-	  off will almost certainly render the resulting system unusable.
-
-config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS
-	bool "ship custom network-scripts along with packages"
-	default y
-	depends on !ADK_LEAVE_ETC_ALONE
-	help
-	  Turning this option to false will prevent the ADK from
-	  installing network-scripts (i.e. files in /etc/network/) for
-	  packages providing any.
-
-	  Note that without further customisation, turning this option
-	  off will almost certainly render the resulting system unusable.
-
+source "package/Config.in.options"
 endmenu
 endmenu
 
 menu "Runtime configuration"
-	visible if !ADK_CHOOSE_APPLIANCE
+	visible if ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN
 source "target/config/Config.in.runtime"
 endmenu
 
-menu "Kernel configuration"
-	visible if !ADK_CHOOSE_APPLIANCE && ADK_TARGET_KERNEL_CUSTOMISING
-
 source "target/config/Config.in.kernelversion"
+
+menu "Kernel configuration"
+	visible if ADK_TARGET_OS_LINUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN
 source "target/config/Config.in.kernelcfg"
 source "target/linux/Config.in"
 endmenu
 
 menu "Toolchain settings"
-	visible if !ADK_CHOOSE_APPLIANCE
 
 config ADK_VENDOR
 	string "Vendor name"
@@ -109,8 +61,6 @@ config ADK_VENDOR
 	help
 	  Vendor string is used for toolchain.
 
-source "target/config/Config.in.endian"
-source "target/config/Config.in.mips"
 source "target/config/Config.in.fpu"
 source "target/config/Config.in.float"
 source "target/config/Config.in.binfmt"
diff --git a/adk/config/symbol.c b/adk/config/symbol.c
index 27f8117d4..685a1ab14 100644
--- a/adk/config/symbol.c
+++ b/adk/config/symbol.c
@@ -393,6 +393,7 @@ void sym_calc_value(struct symbol *sym)
 			}
 		calc_newval:
 			if (sym->dir_dep.tri == no) {
+				/*
 				if (sym->rev_dep.tri != no) {
 					fprintf(stderr, "warning: (");
 					expr_fprint(sym->rev_dep.expr, stderr);
@@ -401,6 +402,7 @@ void sym_calc_value(struct symbol *sym)
 					expr_fprint(sym->dir_dep.expr, stderr);
 					fprintf(stderr, ")\n");
 				}
+				*/
 				for (esv = sym->val_dep; esv; esv = esv->next) {
 					if ((esv->tri != no) &&
 					    (expr_calc_value(esv->value) != no)) {
diff --git a/adk/tools/pkgrebuild.c b/adk/tools/pkgrebuild.c
index e7f037ae5..b4a63d89c 100644
--- a/adk/tools/pkgrebuild.c
+++ b/adk/tools/pkgrebuild.c
@@ -231,8 +231,10 @@ int main() {
 	closedir(pkgdir);
 
 	config = fopen(".config", "r");
-	if (config == NULL)
+	if (config == NULL) {
 		perror(".config is missing.");
+		exit(1);
+	}
 	
 	configmap = strmap_new(1024);
 	while (fgets(buf, 128, config) != NULL) {
@@ -245,8 +247,10 @@ int main() {
 	fclose(config);
 
 	configold = fopen(".config.old", "r");
-	if (configold == NULL)
+	if (configold == NULL) {
 		perror(".config.old is missing.");
+		exit(1);
+	}
 	
 	configoldmap = strmap_new(1024);
 	while (fgets(buf, 128, configold) != NULL) {
diff --git a/docs/adding-boards.txt b/docs/adding-boards.txt
index 4066fd822..4f18dbc08 100644
--- a/docs/adding-boards.txt
+++ b/docs/adding-boards.txt
@@ -16,8 +16,8 @@ target/arm/systems/raspberry-pi2
 ---------------------
 config ADK_TARGET_SYSTEM_RASPBERRY_PI2
         bool "Raspberry PI 2"
-        select ADK_CPU_CORTEX_A7
-        select ADK_TARGET_LITTLE_ENDIAN
+        depends on ADK_TARGET_LITTLE_ENDIAN
+        select ADK_TARGET_CPU_ARM_CORTEX_A7
         select ADK_TARGET_CPU_WITH_NEON
         select ADK_TARGET_BOARD_BCM28XX
         select ADK_TARGET_WITH_VGA
@@ -44,10 +44,10 @@ in OpenADK, you need to port it first.
 The hardware capabilities are optional. (f.e. ADK_TARGET_WITH_SD), but
 required when you configure the driver configuration later.
 
-For architectures with a choice for endianess you should select either
+For architectures with a choice for endianess you should depends on either
 ADK_TARGET_LITTLE_ENDIAN or ADK_TARGET_BIG_ENDIAN.
 
-If the CPU type like in this example ADK_CPU_CORTEX_A7 is not yet available
+If the CPU type like in this example ADK_TARGET_CPU_ARM_CORTEX_A7 is not yet available
 you need to add it to target/config/Config.in.cpu. For optimized code generation
 you should also add ADK_TARGET_GCC_CPU or ADK_TARGET_GCC_ARCH symbol for your CPU
 type. Furthermore you need to decide if your CPU has a MMU, FPU and NPTL support
diff --git a/mk/build.mk b/mk/build.mk
index 691d78e17..0dcea0db6 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -157,15 +157,16 @@ ${ADK_TOPDIR}/package/Depends.mk: ${ADK_TOPDIR}/.config $(wildcard ${ADK_TOPDIR}
 world:
 	@mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
 		$(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
-ifeq ($(ADK_TARGET_TOOLCHAIN),y)
-ifeq ($(ADK_TOOLCHAIN_ONLY),y)
-	$(MAKE) -f mk/build.mk package/hostcompile toolchain/final package/compile
+ifeq ($(ADK_APPLIANCE_TOOLCHAIN),y)
+	$(MAKE) -f mk/build.mk package/hostcompile toolchain/final
 else
-	$(MAKE) -f mk/build.mk package/hostcompile toolchain/final package/compile root_clean package/install
+ifeq ($(ADK_TARGET_OS_BAREMETAL),y)
+	$(MAKE) -f mk/build.mk package/hostcompile toolchain/final
 endif
-else
+ifeq ($(ADK_TARGET_OS_LINUX),y)
 	$(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package/compile root_clean package/install target/install package_index
 endif
+endif
 
 package_index:
 ifeq ($(ADK_TARGET_PACKAGE_IPKG),y)
@@ -265,7 +266,7 @@ cleandir:
 	    ${ADK_TOPDIR}/package/pkglist.d ${ADK_TOPDIR}/package/pkgconfigs.d
 	@rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX)
 	@rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX)
-	@rm -f .menu .tmpconfig.h .rebuild*
+	@rm -f .menu .tmpconfig.h .rebuild* make.log
 	@rm -f ${ADK_TOPDIR}/package/Depends.mk ${ADK_TOPDIR}/prereq.mk
 	@printf "done\n"
 
@@ -287,8 +288,10 @@ distclean:
 	@rm -rf package/pkglist.d package/pkgconfigs.d
 	@rm -f .config* .defconfig .tmpconfig.h all.config prereq.mk make.log
 	@rm -f .firstrun .menu package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.*
-	@rm -f target/*/Config.in.arch* target/*/Config.in.system*
-	@rm -f package/Config.in.auto* package/Config.in.appliances
+	@rm -f target/*/Config.in.arch target/*/Config.in.systems target/config/Config.in.tasks
+	@rm -f target/config/Config.in.arch.choice target/config/Config.in.arch.default
+	@rm -f target/config/Config.in.system.choice target/config/Config.in.system.default
+	@rm -f package/Config.in.auto* target/config/Config.in.system
 	@rm -f target/config/Config.in.prereq target/config/Config.in.scripts
 	@rm -f adk/tools/pkgmaker adk/tools/depmaker adk/tools/pkgrebuild
 	@printf "done\n"
@@ -378,11 +381,17 @@ defconfig: .menu $(CONFIG)/conf
 		echo "ADK_PACKAGE_GLIBC_DEV=y" >> $(ADK_TOPDIR)/.defconfig; \
 	fi
 	@if [ ! -z "$(ADK_APPLIANCE)" ];then \
-		grep "^config" target/config/Config.in.appliances \
+		grep "^config" target/config/Config.in.tasks \
 			|grep -i "_$(ADK_APPLIANCE)$$" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			 >> $(ADK_TOPDIR)/.defconfig; \
 	fi
+	@if [ ! -z "$(ADK_TARGET_OS)" ];then \
+		grep "^config" target/config/Config.in.os \
+			|grep -i "_$(ADK_TARGET_OS)$$" \
+			|sed -e "s#^config \(.*\)#\1=y#" \
+			 >> $(ADK_TOPDIR)/.defconfig; \
+	fi
 	@if [ ! -z "$(ADK_TARGET_ARCH)" ];then \
 		grep "^config" target/config/Config.in.arch.choice \
 			|grep -i "_$(ADK_TARGET_ARCH)$$" \
@@ -422,7 +431,7 @@ defconfig: .menu $(CONFIG)/conf
 	fi
 	@if [ ! -z "$(ADK_TARGET_CPU)" ];then \
 		cpu=$$(echo "$(ADK_TARGET_CPU)" |sed -e "s/-/_/g"); \
-		grep -h "^config" target/config/Config.in.tc \
+		grep -h "^config" target/config/Config.in.cpu \
 			|grep -i "$$cpu$$" \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(ADK_TOPDIR)/.defconfig; \
@@ -453,19 +462,13 @@ defconfig: .menu $(CONFIG)/conf
 			>> $(ADK_TOPDIR)/.defconfig; \
 		fi; \
 	fi
-	@if [ ! -z "$(ADK_TARGET_XTENSA)" ];then \
-		grep "^config" target/config/Config.in.xtensa \
-			|grep -i "$(ADK_TARGET_XTENSA)" \
-			|sed -e "s#^config \(.*\)#\1=y#" \
-			>> $(ADK_TOPDIR)/.defconfig; \
-	fi
 	@if [ ! -z "$(ADK_APPLIANCE)" ];then \
 		$(CONFIG)/conf --defconfig=.defconfig $(CONFIG_CONFIG_IN); \
 	fi
 
 allconfig:
 	@if [ ! -z "$(ADK_APPLIANCE)" ];then \
-		grep "^config" target/config/Config.in.appliances \
+		grep "^config" target/config/Config.in.tasks \
 			|grep -i "_$(ADK_APPLIANCE)"\$$ \
 			|sed -e "s#^config \(.*\)#\1=y#" \
 			>> $(ADK_TOPDIR)/all.config; \
@@ -520,21 +523,16 @@ distclean cleandir:
 	@rm -rf package/pkglist.d package/pkgconfigs.d
 	@rm -f .config* .defconfig .tmpconfig.h all.config make.log
 	@rm -f .menu .rebuild.* package/Depends.mk .ADK_HAVE_DOT_CONFIG prereq.mk
-	@rm -f target/*/Config.in.arch*
-	@rm -f target/*/Config.in.system*
-	@rm -f package/Config.in.auto* package/Config.in.appliances
+	@rm -f target/*/Config.in.arch target/*/Config.in.systems
+	@rm -f target/config/Config.in.arch.choice target/config/Config.in.arch.default
+	@rm -f target/config/Config.in.system.choice target/config/Config.in.system.default
+	@rm -f package/Config.in.auto* target/config/Config.in.system target/config/Config.in.tasks
 	@rm -f target/config/Config.in.prereq target/config/Config.in.scripts
 	@rm -f adk/tools/pkgmaker adk/tools/depmaker adk/tools/pkgrebuild
 	@printf "done\n"
 
 endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y)
 
-buildall:
-	@mkdir -p firmware
-	@echo "=== building $(ADK_TARGET_SYSTEM) ($(ADK_TARGET_ARCH)) with $(ADK_TARGET_LIBC) ==="
-	$(GMAKE) ADK_APPLIANCE=new ADK_TARGET_ARCH=$(ADK_TARGET_ARCH) ADK_TARGET_SYSTEM=$(ADK_TARGET_SYSTEM) ADK_TARGET_LIBC=$(ADK_TARGET_LIBC) allmodconfig
-	$(GMAKE) ADK_VERBOSE=1 all 2>&1 | tee firmware/buildall.log
-
 $(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c
 	@$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c
 
@@ -544,7 +542,7 @@ $(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_T
 $(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c
 	@$(HOST_CC) $(HOST_CFLAGS) -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c
 
-menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard target/appliances/*)
+menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard tasks/*)
 	@printf " --->  generating menu structure.. "
 	@$(SHELL) $(ADK_TOPDIR)/scripts/create-menu
 	@$(ADK_TOPDIR)/adk/tools/pkgmaker
diff --git a/mk/image.mk b/mk/image.mk
index f88fd1e87..d700f00bb 100644
--- a/mk/image.mk
+++ b/mk/image.mk
@@ -1,6 +1,7 @@
 # This file is part of the OpenADK project. OpenADK is copyrighted
 # material, please see the LICENCE file in the top-level directory.
 
+ifeq ($(ADK_TARGET_OS_LINUX),y)
 # relative paths, like 'mksh' or '../usr/bin/foosh'
 ifeq (${ADK_BINSH_ASH},y)
 BINSH:=ash
@@ -36,6 +37,7 @@ ROOTSH:=/bin/zsh
 else
 $(error No login shell configured!)
 endif
+endif
 
 imageprepare: image-prepare-post extra-install prelink
 
diff --git a/mk/vars.mk b/mk/vars.mk
index 98e94c863..91587382e 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -9,18 +9,21 @@ INSTALL_SCRIPT=		install -m0755
 MAKEFLAGS=		$(EXTRA_MAKEFLAGS)
 BUILD_USER=		$(shell id -un)
 BUILD_GROUP=		$(shell id -gn)
-ADK_SUFFIX:=		${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}
-ifneq ($(ADK_TARGET_FLOAT),)
-ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_FLOAT)
+ADK_SUFFIX:=		${ADK_TARGET_SYSTEM}
+ifneq ($(ADK_TARGET_ENDIAN_SUFFIX),)
+ADK_SUFFIX:=		$(ADK_SUFFIX)$(ADK_TARGET_ENDIAN_SUFFIX)
 endif
-ifneq ($(ADK_TARGET_ABI),)
-ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_ABI)
+ifneq ($(ADK_TARGET_LIBC),)
+ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_LIBC)
 endif
 ifneq ($(ADK_TARGET_CPU_TYPE),)
 ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_CPU_TYPE)
 endif
-ifeq ($(ADK_TARGET_WITH_MMU),)
-ADK_SUFFIX:=		$(ADK_SUFFIX)_nommu
+ifneq ($(ADK_TARGET_FLOAT),)
+ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_FLOAT)
+endif
+ifneq ($(ADK_TARGET_ABI),)
+ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_ABI)
 endif
 
 # some global dirs
@@ -126,14 +129,9 @@ endif
 
 # for architectures where gcc --with-cpu matches -mcpu=
 ifneq ($(ADK_TARGET_GCC_CPU),)
-ifeq ($(ADK_CPU_ARC700),y)
-TARGET_CFLAGS+=		-mcpu=ARC700
-TARGET_CXXFLAGS+=	-mcpu=ARC700
-else
 TARGET_CFLAGS+=		-mcpu=$(ADK_TARGET_GCC_CPU)
 TARGET_CXXFLAGS+=	-mcpu=$(ADK_TARGET_GCC_CPU)
 endif
-endif
 
 # for archiectures where gcc --with-arch matches -march=
 ifneq ($(ADK_TARGET_GCC_ARCH),)
diff --git a/package/Config.in.options b/package/Config.in.options
new file mode 100644
index 000000000..a806da895
--- /dev/null
+++ b/package/Config.in.options
@@ -0,0 +1,72 @@
+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
+
+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
+config ADK_LEAVE_ETC_ALONE
+	bool "do not install anything into /etc"
+	default n
+	help
+	  Enabling this option will prevent the ADK from installing anything
+	  into /etc. This is useful for highly customised setups with custom
+	  base-files packages.
+
+	  Package Makefiles can override this setting by passing "force_etc" to
+	  the package-template.  to a non-empty value. This is useful for
+	  packages traditionally installing non-config stuff into /etc, like
+	  e.g. ca-certificates.
+
+	  Note that without further customisation, turning this option
+	  on will almost certainly render the resulting system unusable.
+
+config ADK_INSTALL_PACKAGE_INIT_SCRIPTS
+	bool "ship custom init-scripts along with packages"
+	default y
+	depends on !ADK_LEAVE_ETC_ALONE
+	help
+	  Turning this option to false will prevent the ADK from
+	  installing init-scripts (i.e. files in /etc/init.d) for
+	  certain daemons and daemon-like applications.
+
+	  Note that without further customisation, turning this option
+	  off will almost certainly render the resulting system unusable.
+
+config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS
+	bool "ship custom network-scripts along with packages"
+	default y
+	depends on !ADK_LEAVE_ETC_ALONE
+	help
+	  Turning this option to false will prevent the ADK from
+	  installing network-scripts (i.e. files in /etc/network/) for
+	  packages providing any.
+
+	  Note that without further customisation, turning this option
+	  off will almost certainly render the resulting system unusable.
+
+
diff --git a/package/boost/Makefile b/package/boost/Makefile
index dd08b0f34..8fee53109 100644
--- a/package/boost/Makefile
+++ b/package/boost/Makefile
@@ -107,10 +107,10 @@ endif
 ifeq ($(ADK_TARGET_ARCH),ppc)
 BOOST_ARCH:=	power
 endif
-ifeq ($(ADK_CPU_MIPS32),y)
+ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32),y)
 BOOST_ARCH:=	mips32
 endif
-ifeq ($(ADK_CPU_MIPS32R2),y)
+ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32R2),y)
 BOOST_ARCH:=	mips32r2
 endif
 
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile
index f3f69ab26..f91bf3347 100644
--- a/package/ffmpeg/Makefile
+++ b/package/ffmpeg/Makefile
@@ -154,11 +154,10 @@ endif
 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y)
 CONFIGURE_CPU_OPTS:=	--enable-armv6
 endif
-ifeq ($(ADK_CPU_MIPS32),y)
+ifeq ($(ADK_TARGET_CPU_MIPS_MIPS32),y)
 CONFIGURE_CPU_OPTS+=	--disable-mipsdspr1 --disable-mipsdspr2
 endif
 
-
 CONFIG_STYLE:=		minimal
 CONFIGURE_ARGS:=	--prefix=/usr \
 			--target-os=linux \
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index 6624394ef..8a0eabff3 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -69,9 +69,6 @@ PKGFS_WITH_LIRC:=	lirc
 PKGFD_WITH_WEBSERVER:=	enable internal webserver support
 
 PKG_BUILDDEP_SOLIDRUN_IMX6:=	gpu-viv-bin-mx6q
-
-# freescale GL libraries linked against glibc
-PKG_LIBC_DEPENDS:=	glibc uclibc-ng
 PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi2 solidrun-imx6
 
 DIFF_IGNOREFILES:=	configure missing depcomp install-sh INSTALL \
diff --git a/package/libgcc/Makefile b/package/libgcc/Makefile
index 9926ed960..36f7ae6f2 100644
--- a/package/libgcc/Makefile
+++ b/package/libgcc/Makefile
@@ -26,10 +26,10 @@ INSTALL_STYLE:=		manual
 libgcc-install:
 	$(INSTALL_DIR) ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 ifeq ($(ADK_TARGET_ARCH_SH),y)
-ifeq ($(ADK_CPU_SH3),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/!m3*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
-ifeq ($(ADK_CPU_SH4),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH4),y)
 	${CP} ${STAGING_TARGET_DIR}/usr/lib/!m4*/libgcc*.so* ${IDIR_LIBGCC}/$(ADK_TARGET_LIBC_PATH)
 endif
 else
diff --git a/package/libvpx/Makefile b/package/libvpx/Makefile
index 18b56e847..3b2fa5ec4 100644
--- a/package/libvpx/Makefile
+++ b/package/libvpx/Makefile
@@ -44,7 +44,7 @@ endif
 ifeq ($(ADK_TARGET_ARCH_MIPS),y)
 CONFIGURE_ARGS+=	--target=mips32-linux-gcc
 endif
-ifeq ($(ADK_CPU_LOONGSON2F),y)
+ifeq ($(ADK_TARGET_CPU_MIPS64_LOONGSON2F),y)
 CONFIGURE_ARGS+=	--target=loongson2f-linux-gcc
 endif
 ifeq ($(ADK_TARGET_ARCH_MIPS64),y)
diff --git a/package/mpg123/Makefile b/package/mpg123/Makefile
index 7629c9a86..28d9b74ca 100644
--- a/package/mpg123/Makefile
+++ b/package/mpg123/Makefile
@@ -23,10 +23,10 @@ $(eval $(call PKG_template,MPG123,mpg123,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEP
 
 AUTOTOOL_STYLE:=	autoreconf
 
-ifeq ($(ADK_CPU_I486),y)
+ifeq ($(ADK_TARGET_CPU_X86_I486),y)
 CONFIGURE_ARGS+=	--with-cpu=i486
 endif
-ifeq ($(ADK_CPU_I586),y)
+ifeq ($(ADK_TARGET_CPU_X86_I586),y)
 CONFIGURE_ARGS+=	--with-cpu=i586
 endif
 ifeq ($(ADK_TARGET_CPU_WITH_NEON),y)
diff --git a/rules.mk b/rules.mk
index a734408f8..29d147149 100644
--- a/rules.mk
+++ b/rules.mk
@@ -25,7 +25,6 @@ SET_DASHX:=		:
 endif
 
 # Strip off the annoying quoting
-ADK_APPLIANCE_VERSION:=			$(strip $(subst ",, $(ADK_APPLIANCE_VERSION)))
 ADK_TARGET_ARCH:=			$(strip $(subst ",, $(ADK_TARGET_ARCH)))
 ADK_TARGET_SYSTEM:=			$(strip $(subst ",, $(ADK_TARGET_SYSTEM)))
 ADK_TARGET_BOARD:=			$(strip $(subst ",, $(ADK_TARGET_BOARD)))
@@ -35,6 +34,7 @@ ADK_TARGET_KERNEL:=			$(strip $(subst ",, $(ADK_TARGET_KERNEL)))
 ADK_TARGET_LIBC:=			$(strip $(subst ",, $(ADK_TARGET_LIBC)))
 ADK_TARGET_LIBC_PATH:=			$(strip $(subst ",, $(ADK_TARGET_LIBC_PATH)))
 ADK_TARGET_ENDIAN:=			$(strip $(subst ",, $(ADK_TARGET_ENDIAN)))
+ADK_TARGET_ENDIAN_SUFFIX:=		$(strip $(subst ",, $(ADK_TARGET_ENDIAN_SUFFIX)))
 ADK_TARGET_GCC_CPU:=			$(strip $(subst ",, $(ADK_TARGET_GCC_CPU)))
 ADK_TARGET_GCC_ARCH:=			$(strip $(subst ",, $(ADK_TARGET_GCC_ARCH)))
 ADK_TARGET_FLOAT:=			$(strip $(subst ",, $(ADK_TARGET_FLOAT)))
@@ -46,7 +46,6 @@ ADK_TARGET_CFLAGS_OPT:=			$(strip $(subst ",, $(ADK_TARGET_CFLAGS_OPT)))
 ADK_TARGET_ABI_CFLAGS:=			$(strip $(subst ",, $(ADK_TARGET_ABI_CFLAGS)))
 ADK_TARGET_ABI:=			$(strip $(subst ",, $(ADK_TARGET_ABI)))
 ADK_TARGET_MIPS_ABI:=			$(strip $(subst ",, $(ADK_TARGET_MIPS_ABI)))
-ADK_TARGET_XTENSA:=			$(strip $(subst ",, $(ADK_TARGET_XTENSA)))
 ADK_TARGET_IP:=				$(strip $(subst ",, $(ADK_TARGET_IP)))
 ADK_TARGET_SUFFIX:=			$(strip $(subst ",, $(ADK_TARGET_SUFFIX)))
 ADK_TARGET_CMDLINE:=			$(strip $(subst ",, $(ADK_TARGET_CMDLINE)))
diff --git a/scripts/create-menu b/scripts/create-menu
index 3624776e7..e0552d44b 100755
--- a/scripts/create-menu
+++ b/scripts/create-menu
@@ -11,20 +11,13 @@ printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.sys
 printf "source target/config/Config.in.system.default\n" >> target/config/Config.in.system
 printf "source target/config/Config.in.system.choice\n" >> target/config/Config.in.system
 
-# update appliances
-if [ -d "$topdir/target/appliances" ];then
-	printf "# autogenerated via scripts/create-menu\n" > $topdir/target/config/Config.in.appliances
-	printf "choice\n" >> $topdir/target/config/Config.in.appliances
-	printf "prompt \"Appliance\"\n\n" >> $topdir/target/config/Config.in.appliances
-	printf "config ADK_CHOOSE_APPLIANCE\n" >> $topdir/target/config/Config.in.appliances
-	printf "\tprompt \"choose an appliance\"\n" >> $topdir/target/config/Config.in.appliances
-	printf "\tbool\n\n" >> $topdir/target/config/Config.in.appliances
-	cat $topdir/target/appliances/*.appliance >> $topdir/target/config/Config.in.appliances 2>/dev/null
-	printf "\nendchoice\n\n" >> $topdir/target/config/Config.in.appliances
-	printf "menu \"Appliance Options\"\n" >> $topdir/target/config/Config.in.appliances
-	printf "\tvisible if !ADK_CHOOSE_APPLIANCE\n" >> $topdir/target/config/Config.in.appliances
-	cat $topdir/target/appliances/*.options >> $topdir/target/config/Config.in.appliances 2>/dev/null
-	printf "endmenu\n" >> $topdir/target/config/Config.in.appliances
+# update tasks
+if [ -d "$topdir/tasks" ];then
+	printf "# autogenerated via scripts/create-menu\n" > $topdir/target/config/Config.in.tasks
+	printf "choice\n" >> $topdir/target/config/Config.in.tasks
+	printf "prompt \"Task\"\n\n" >> $topdir/target/config/Config.in.tasks
+	cat $topdir/tasks/* >> $topdir/target/config/Config.in.tasks 2>/dev/null
+	printf "\nendchoice\n\n" >> $topdir/target/config/Config.in.tasks
 fi
 
 # create system default
@@ -43,9 +36,19 @@ for i in $systems;do
 done
 
 # create or update systems
+for arch in $(cat $topdir/target/arch.lst);do
+	ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
+	printf "config ADK_TARGET_SYSTEM_GENERIC_$ARCH\n" > $topdir/target/$arch/Config.in.systems
+	printf "\tbool \"Generic\"\n" >> $topdir/target/$arch/Config.in.systems
+	printf "\tselect ADK_TARGET_GENERIC\n" >> $topdir/target/$arch/Config.in.systems
+	printf "\thelp\n" >> $topdir/target/$arch/Config.in.systems
+	printf "\t  Generic $ARCH system.\n\n" >> $topdir/target/$arch/Config.in.systems
+	printf "\tdefault \"generic-${arch}\" if ADK_TARGET_SYSTEM_GENERIC_$ARCH\n" >> $topdir/target/config/Config.in.system.default
+done
+
 for i in $(ls $topdir/target/);do
 	if [ -d "$topdir/target/$i/systems" ];then
-		cat $topdir/target/$i/systems/* > $topdir/target/$i/Config.in.systems 2>/dev/null
+		cat $topdir/target/$i/systems/* >> $topdir/target/$i/Config.in.systems 2>/dev/null
 	fi
 done
 
@@ -55,7 +58,7 @@ printf "# autogenerated via scripts/create-menu\n" > target/config/Config.in.arc
 for arch in $(cat $topdir/target/arch.lst);do
 	ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
 	printf "choice\n" > $topdir/target/$arch/Config.in.arch
-	printf "prompt \"Embedded system\"\n" >> $topdir/target/$arch/Config.in.arch
+	printf "prompt \"System\"\n" >> $topdir/target/$arch/Config.in.arch
 	printf "depends on ADK_TARGET_ARCH_$ARCH\n" >> $topdir/target/$arch/Config.in.arch
 	printf "source target/$arch/Config.in.systems\n" >> $topdir/target/$arch/Config.in.arch
 	printf "endchoice\n" >> $topdir/target/$arch/Config.in.arch
@@ -82,7 +85,15 @@ EOD
 for arch in $(cat $topdir/target/arch.lst);do
 	ARCH=$(echo $arch | tr '[:lower:]' '[:upper:]')
 	printf "config ADK_TARGET_ARCH_$ARCH\n" >> $topdir/target/config/Config.in.arch.choice
-	printf "\tbool \"$arch system\"\n" >> $topdir/target/config/Config.in.arch.choice
+	printf "\tbool \"$arch\"\n" >> $topdir/target/config/Config.in.arch.choice
+	case $arch in
+		alpha|ia64|sh|sparc64|s390|tile|ppc64|mips64|x86_64)
+		  printf "\tdepends on ADK_TARGET_OS_LINUX\n" >> $topdir/target/config/Config.in.arch.choice
+		  ;;
+		nds32|moxie|v850)
+		  printf "\tdepends on ADK_TARGET_OS_BAREMETAL\n" >> $topdir/target/config/Config.in.arch.choice
+		  ;;
+	esac
 	printf "\thelp\n" >> $topdir/target/config/Config.in.arch.choice
 	printf "\t  Support for $ARCH systems.\n\n" >> $topdir/target/config/Config.in.arch.choice
 done
diff --git a/target/aarch64/kernel/generic-aarch64 b/target/aarch64/kernel/generic-aarch64
new file mode 100644
index 000000000..e40393f9a
--- /dev/null
+++ b/target/aarch64/kernel/generic-aarch64
@@ -0,0 +1 @@
+CONFIG_ARM64=y
diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm
index fea3ada10..d76fbc1cf 100644
--- a/target/aarch64/systems/arm-fm
+++ b/target/aarch64/systems/arm-fm
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_ARM_FM
 	bool "ARMv8 Foundation Model"
-	select ADK_CPU_CORTEX_A57
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_CORTEX_A57
 	select ADK_TARGET_KERNEL_IMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_PACKAGE_BOOT_WRAPPER_AARCH64
diff --git a/target/aarch64/systems/qemu-aarch64 b/target/aarch64/systems/qemu-aarch64
index e649aad11..daf8a359b 100644
--- a/target/aarch64/systems/qemu-aarch64
+++ b/target/aarch64/systems/qemu-aarch64
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_AARCH64
 	bool "Qemu Emulator"
-	select ADK_CPU_CORTEX_A57
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_CORTEX_A57
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_IMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/aarch64/systems/toolchain-aarch64 b/target/aarch64/systems/toolchain-aarch64
deleted file mode 100644
index 8f490dd5a..000000000
--- a/target/aarch64/systems/toolchain-aarch64
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
-	bool "Toolchain only"
-	select ADK_CPU_CORTEX_A57
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  AARCH64 toolchain.
-
diff --git a/target/alpha/kernel/generic-alpha b/target/alpha/kernel/generic-alpha
new file mode 100644
index 000000000..3e1cf8337
--- /dev/null
+++ b/target/alpha/kernel/generic-alpha
@@ -0,0 +1 @@
+CONFIG_ALPHA=y
diff --git a/target/alpha/systems/qemu-alpha b/target/alpha/systems/qemu-alpha
index 7dd387817..59bdbc9f0 100644
--- a/target/alpha/systems/qemu-alpha
+++ b/target/alpha/systems/qemu-alpha
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_ALPHA
 	bool "Qemu Emulator"
-	select ADK_CPU_ALPHA
+	select ADK_TARGET_CPU_ALPHA
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/alpha/systems/toolchain-alpha b/target/alpha/systems/toolchain-alpha
deleted file mode 100644
index efa21c747..000000000
--- a/target/alpha/systems/toolchain-alpha
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_ALPHA
-	bool "Toolchain only"
-	select ADK_CPU_ALPHA
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  ALPHA toolchain.
-
diff --git a/target/appliances/default.options b/target/appliances/default.options
deleted file mode 100644
index bf6ca0e25..000000000
--- a/target/appliances/default.options
+++ /dev/null
@@ -1,5 +0,0 @@
-config ADK_APPLIANCE_VERSION
-	prompt "version string"
-	string
-	help
-	  Configure version for appliance
diff --git a/target/appliances/mpd.options b/target/appliances/mpd.options
deleted file mode 100644
index 9d19f2e5b..000000000
--- a/target/appliances/mpd.options
+++ /dev/null
@@ -1,17 +0,0 @@
-choice
-prompt "Choose a GUI"
-depends on ADK_APPLIANCE_MPD
-
-config ADK_APPLIANCE_MPD_MPDBOX
-	bool "use mpdbox html/javascript frontend"
-	select ADK_PACKAGE_MPDBOX
-
-config ADK_APPLIANCE_MPD_YMPD
-	bool "use ympd frontend"
-	select ADK_PACKAGE_YMPD
-	select ADK_RUNTIME_START_YMPD
-
-config ADK_APPLIANCE_MPD_NOGUI
-	bool "use no gui frontend"
-
-endchoice
diff --git a/target/arc/kernel/generic-arc b/target/arc/kernel/generic-arc
new file mode 100644
index 000000000..094fe8e9e
--- /dev/null
+++ b/target/arc/kernel/generic-arc
@@ -0,0 +1 @@
+CONFIG_ARC=y
diff --git a/target/arc/systems/nsim-arcv1 b/target/arc/systems/nsim-arcv1
index 1f0dc7dcd..65706b24f 100644
--- a/target/arc/systems/nsim-arcv1
+++ b/target/arc/systems/nsim-arcv1
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_NSIM_ARCV1
 	bool "Synopsys NSIM Emulator (ARCv1)"
-	select ADK_CPU_ARC700
+	select ADK_TARGET_CPU_ARC_ARC700
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/arc/systems/nsim-arcv2 b/target/arc/systems/nsim-arcv2
index 949acfbf6..c56b16c3a 100644
--- a/target/arc/systems/nsim-arcv2
+++ b/target/arc/systems/nsim-arcv2
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_NSIM_ARCV2
 	bool "Synopsys NSIM Emulator (ARCv2)"
-	select ADK_CPU_ARC_HS
+	select ADK_TARGET_CPU_ARC_ARC_HS
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/arc/systems/toolchain-arc b/target/arc/systems/toolchain-arc
deleted file mode 100644
index 15e5b58fc..000000000
--- a/target/arc/systems/toolchain-arc
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_ARC
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  ARC toolchain.
-
diff --git a/target/arm/kernel/generic-arm b/target/arm/kernel/generic-arm
new file mode 100644
index 000000000..a2666cde3
--- /dev/null
+++ b/target/arm/kernel/generic-arm
@@ -0,0 +1 @@
+CONFIG_ARM=y
diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro
index 50cdd6d80..e5bcc2b1c 100644
--- a/target/arm/systems/banana-pro
+++ b/target/arm/systems/banana-pro
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_BANANA_PRO
 	bool "Banana Pro"
-	select ADK_CPU_CORTEX_A7
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_CORTEX_A7
 	select ADK_TARGET_CPU_WITH_NEON
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/beaglebone-black b/target/arm/systems/beaglebone-black
index 25ef8ee6f..736975ae0 100644
--- a/target/arm/systems/beaglebone-black
+++ b/target/arm/systems/beaglebone-black
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	bool "BeagleBone Black"
-	select ADK_TARGET_LITTLE_ENDIAN
-	select ADK_CPU_CORTEX_A8
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_CORTEX_A8
 	select ADK_TARGET_CPU_WITH_NEON
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70
index a54fc3afd..66eedf140 100644
--- a/target/arm/systems/kinetis-k70
+++ b/target/arm/systems/kinetis-k70
@@ -1,8 +1,8 @@
 config ADK_TARGET_SYSTEM_KINETIS_K70
 	bool "Kinetis K70"
 	depends on ADK_EXPERIMENTAL
-	select ADK_CPU_CORTEX_M3
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_CORTEX_M3
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_NETDEVICE
diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2
index ee7da28e5..c54356aa9 100644
--- a/target/arm/systems/linksys-nslu2
+++ b/target/arm/systems/linksys-nslu2
@@ -1,8 +1,8 @@
 config ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	bool "Linksys NSLU2"
 	depends on ADK_EXPERIMENTAL
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_BIG_ENDIAN
+	depends on ADK_TARGET_BIG_ENDIAN
+	select ADK_TARGET_CPU_ARM_XSCALE
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/qemu-arm-realview-eb-mpcore b/target/arm/systems/qemu-arm-realview-eb-mpcore
index f8de055a8..5a65aca72 100644
--- a/target/arm/systems/qemu-arm-realview-eb-mpcore
+++ b/target/arm/systems/qemu-arm-realview-eb-mpcore
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE
 	bool "Qemu Emulator (Realview/EB-Mpcore)"
-	select ADK_CPU_ARM11MPCORE
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_ARM11MPCORE
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_WITH_SMP
 	select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz
index 45d2cf0ed..a695065e6 100644
--- a/target/arm/systems/qemu-arm-spitz
+++ b/target/arm/systems/qemu-arm-spitz
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ
 	bool "Qemu Emulator (Spitz PDA)"
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_XSCALE
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier
index 46808c09b..f6dbd6b6b 100644
--- a/target/arm/systems/qemu-arm-terrier
+++ b/target/arm/systems/qemu-arm-terrier
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER
 	bool "Qemu Emulator (Terrier PDA)"
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_XSCALE
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/arm/systems/qemu-arm-versatilepb b/target/arm/systems/qemu-arm-versatilepb
index 94ae74d17..2ab7f712f 100644
--- a/target/arm/systems/qemu-arm-versatilepb
+++ b/target/arm/systems/qemu-arm-versatilepb
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB
 	bool "Qemu Emulator (Versatile/PB)"
-	select ADK_CPU_ARM926EJ_S
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_ARM926EJ_S
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/arm/systems/qemu-arm-vexpress-a9 b/target/arm/systems/qemu-arm-vexpress-a9
index bfa22e068..faff5f31b 100644
--- a/target/arm/systems/qemu-arm-vexpress-a9
+++ b/target/arm/systems/qemu-arm-vexpress-a9
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9
 	bool "Qemu Emulator (Vexpress A9)"
-	select ADK_CPU_CORTEX_A9
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_CORTEX_A9
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi
index f1a89aebd..233dc15e8 100644
--- a/target/arm/systems/raspberry-pi
+++ b/target/arm/systems/raspberry-pi
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_RASPBERRY_PI
 	bool "Raspberry PI"
-	select ADK_CPU_ARM1176JZF_S
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_ARM1176JZF_S
 	select ADK_TARGET_BOARD_BCM28XX
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2
index 356e48a03..c080347c0 100644
--- a/target/arm/systems/raspberry-pi2
+++ b/target/arm/systems/raspberry-pi2
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_RASPBERRY_PI2
 	bool "Raspberry PI 2"
-	select ADK_CPU_CORTEX_A7
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_CORTEX_A7
 	select ADK_TARGET_BOARD_BCM28XX
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus
index ec3ff58a9..f30c4922f 100644
--- a/target/arm/systems/sharp-zaurus
+++ b/target/arm/systems/sharp-zaurus
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	bool "Sharp Zaurus CL3200 (Terrier)"
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_XSCALE
 	select ADK_TARGET_CPU_WITH_IWMMXT
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6
index 42166edb0..cb1c630da 100644
--- a/target/arm/systems/solidrun-imx6
+++ b/target/arm/systems/solidrun-imx6
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	bool "Solidrun IMX6 Embedded Systems"
-	select ADK_CPU_CORTEX_A9
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_ARM_CORTEX_A9
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_PCI
diff --git a/target/arm/systems/toolchain-arm b/target/arm/systems/toolchain-arm
deleted file mode 100644
index 268daed0d..000000000
--- a/target/arm/systems/toolchain-arm
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  ARM toolchain.
-
diff --git a/target/avr32/kernel/generic-avr32 b/target/avr32/kernel/generic-avr32
new file mode 100644
index 000000000..592bedbd7
--- /dev/null
+++ b/target/avr32/kernel/generic-avr32
@@ -0,0 +1 @@
+CONFIG_AVR32=y
diff --git a/target/avr32/systems/atmel-ngw100 b/target/avr32/systems/atmel-ngw100
index 074472aa4..3c5808d90 100644
--- a/target/avr32/systems/atmel-ngw100
+++ b/target/avr32/systems/atmel-ngw100
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_ATMEL_NGW100
 	bool "Atmel NGW100"
-	select ADK_CPU_AVR32
+	select ADK_TARGET_CPU_AVR32
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_NET
diff --git a/target/avr32/systems/toolchain-avr32 b/target/avr32/systems/toolchain-avr32
deleted file mode 100644
index 76df7491c..000000000
--- a/target/avr32/systems/toolchain-avr32
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_AVR32
-	bool "Toolchain only"
-	select ADK_CPU_AVR32
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  AVR32 toolchain.
-
diff --git a/target/bfin/kernel/generic-bfin b/target/bfin/kernel/generic-bfin
new file mode 100644
index 000000000..864f18f30
--- /dev/null
+++ b/target/bfin/kernel/generic-bfin
@@ -0,0 +1 @@
+CONFIG_BLACKFIN=y
diff --git a/target/bfin/systems/sim-bfin b/target/bfin/systems/sim-bfin
index 6b1902283..619d5e1ec 100644
--- a/target/bfin/systems/sim-bfin
+++ b/target/bfin/systems/sim-bfin
@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_SIM_BFIN
 	bool "GDB simulator"
-	select ADK_CPU_BFIN
 	select ADK_TARGET_SIM
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/bfin/systems/toolchain-bfin b/target/bfin/systems/toolchain-bfin
deleted file mode 100644
index 64f8b2c46..000000000
--- a/target/bfin/systems/toolchain-bfin
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_BFIN
-	bool "Toolchain only"
-	select ADK_CPU_BFIN
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  BFIN toolchain.
-
diff --git a/target/c6x/systems/toolchain-c6x b/target/c6x/systems/toolchain-c6x
deleted file mode 100644
index 78093e92d..000000000
--- a/target/c6x/systems/toolchain-c6x
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_C6X
-	bool "Toolchain only"
-	select ADK_CPU_C6X
-	select ADK_TARGET_UCLINUX
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  C6X toolchain.
-
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
diff --git a/target/cris/systems/qemu-cris b/target/cris/systems/qemu-cris
index 438af9613..8dfe67903 100644
--- a/target/cris/systems/qemu-cris
+++ b/target/cris/systems/qemu-cris
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_CRIS
 	bool "Qemu Emulator"
-	select ADK_CPU_CRIS_V32
+	select ADK_TARGET_CPU_CRIS_CRISV32
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_IMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/cris/systems/toolchain-cris b/target/cris/systems/toolchain-cris
deleted file mode 100644
index 6615da6ad..000000000
--- a/target/cris/systems/toolchain-cris
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_CRIS
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  CRIS toolchain.
-
diff --git a/target/frv/systems/sim-frv b/target/frv/systems/sim-frv
index 70fea8f5c..f613220ea 100644
--- a/target/frv/systems/sim-frv
+++ b/target/frv/systems/sim-frv
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_SIM_FRV
 	bool "GDB simulator"
-	select ADK_CPU_FRV
+	select ADK_TARGET_CPU_FRV
 	select ADK_TARGET_SIM
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/frv/systems/toolchain-frv b/target/frv/systems/toolchain-frv
deleted file mode 100644
index 8591b6950..000000000
--- a/target/frv/systems/toolchain-frv
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_FRV
-	bool "Toolchain only"
-	select ADK_CPU_FRV
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  FRV toolchain.
-
diff --git a/target/h8300/systems/sim-h8300h b/target/h8300/systems/sim-h8300h
index d6cc62c94..1c82e1012 100644
--- a/target/h8300/systems/sim-h8300h
+++ b/target/h8300/systems/sim-h8300h
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_SIM_H8300H
 	bool "GDB simulator"
-	select ADK_CPU_H8300
+	select ADK_TARGET_CPU_H8300
 	select ADK_TARGET_SIM
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/h8300/systems/toolchain-h8300 b/target/h8300/systems/toolchain-h8300
deleted file mode 100644
index 55972fd60..000000000
--- a/target/h8300/systems/toolchain-h8300
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_H8300
-	bool "Toolchain only"
-	select ADK_CPU_H8300
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  H8/300 toolchain.
-
diff --git a/target/hppa/systems/toolchain-hppa b/target/hppa/systems/toolchain-hppa
deleted file mode 100644
index 934e353ba..000000000
--- a/target/hppa/systems/toolchain-hppa
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_HPPA
-	bool "Toolchain only"
-	select ADK_CPU_PARISC
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  HPPA toolchain.
-
diff --git a/target/ia64/systems/toolchain-ia64 b/target/ia64/systems/toolchain-ia64
deleted file mode 100644
index 91ab2b006..000000000
--- a/target/ia64/systems/toolchain-ia64
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_IA64
-	bool "Toolchain only"
-	select ADK_CPU_IA64
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  IA64 toolchain.
-
diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c
index dbfac7f89..5956073d3 100644
--- a/target/linux/config/Config.in.i2c
+++ b/target/linux/config/Config.in.i2c
@@ -48,10 +48,10 @@ config ADK_KERNEL_I2C_IMX
 	
 config ADK_KERNEL_SCX200_ACB
 	tristate "I2C driver for Geode"
-	depends on ADK_CPU_GEODE
+	depends on ADK_TARGET_CPU_X86_GEODE
 	select ADK_KERNEL_I2C
 	select ADK_KERNEL_I2C_CHARDEV
-	default y if ADK_CPU_GEODE
+	default y if ADK_TARGET_CPU_X86_GEODE
 	default n
 	help
 	  I2C driver for Geode boards.
diff --git a/target/linux/config/Config.in.watchdog b/target/linux/config/Config.in.watchdog
index 07f8e8957..f277c8c01 100644
--- a/target/linux/config/Config.in.watchdog
+++ b/target/linux/config/Config.in.watchdog
@@ -63,7 +63,7 @@ config ADK_KERNEL_AR7_WDT
 
 config ADK_KERNEL_GEODE_WDT
 	bool "Geode Hardware Watchdog"
-	depends on ADK_CPU_GEODE
+	depends on ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	select ADK_KERNEL_WATCHDOG
 	select ADK_KERNEL_MISC_DEVICES
 	select ADK_KERNEL_CS5535_MFGPT
diff --git a/target/linux/config/Config.in.xtensa b/target/linux/config/Config.in.xtensa
index 3839251ee..3f9c33f52 100644
--- a/target/linux/config/Config.in.xtensa
+++ b/target/linux/config/Config.in.xtensa
@@ -15,8 +15,8 @@ config ADK_KERNEL_XTENSA_VARIANT_CUSTOM
 
 config ADK_KERNEL_XTENSA_VARIANT_CUSTOM_NAME
 	string
-	default "de212" if ADK_TARGET_XTENSA_DE212
+	default "de212" if ADK_TARGET_CPU_XTENSA_DE212
 
 config ADK_KERNEL_BUILTIN_DTB
 	string
-	default "kc705_nommu" if ADK_TARGET_XTENSA_DE212
+	default "kc705_nommu" if ADK_TARGET_CPU_XTENSA_DE212
diff --git a/target/lm32/systems/qemu-lm32 b/target/lm32/systems/qemu-lm32
index dbd602bb2..5406c4663 100644
--- a/target/lm32/systems/qemu-lm32
+++ b/target/lm32/systems/qemu-lm32
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_LM32
 	bool "Qemu Emulator"
 	select ADK_TARGET_QEMU
-	select ADK_CPU_LM32
+	select ADK_TARGET_CPU_LM32
 	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_KERNEL_VERSION_GIT
 	select ADK_TARGET_KERNEL_REPO "https://github.com/m-labs/linux-milkymist.git"
diff --git a/target/lm32/systems/toolchain-lm32 b/target/lm32/systems/toolchain-lm32
deleted file mode 100644
index 51a74337d..000000000
--- a/target/lm32/systems/toolchain-lm32
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_LM32
-	bool "Toolchain only"
-	select ADK_CPU_LM32
-	select ADK_TARGET_UCLINUX
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	select ADK_TARGET_KERNEL_VERSION_GIT
-	select ADK_TARGET_KERNEL_REPO "https://github.com/m-labs/linux-milkymist.git"
-	select ADK_TARGET_KERNEL_HASH "6a2f2e4198eaff63ee75f6085ce9f966c47b4441"
-	help
-	  LM32 toolchain.
-
diff --git a/target/m68k/systems/aranym-m68k b/target/m68k/systems/aranym-m68k
index 57d0b0d56..299f7a27d 100644
--- a/target/m68k/systems/aranym-m68k
+++ b/target/m68k/systems/aranym-m68k
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_ARANYM_M68K
 	bool "ARAnyM Emulator"
-	select ADK_CPU_68040
+	select ADK_TARGET_CPU_M68K_68040
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_INPUT
 	select ADK_TARGET_WITH_PCI
diff --git a/target/m68k/systems/qemu-m68k-mcf5208 b/target/m68k/systems/qemu-m68k-mcf5208
index 6e7bf2820..921300bbc 100644
--- a/target/m68k/systems/qemu-m68k-mcf5208
+++ b/target/m68k/systems/qemu-m68k-mcf5208
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
 	bool "Qemu M68K (Coldfire MCF5208)"
 	select ADK_TARGET_QEMU
-	select ADK_CPU_CF_5208
+	select ADK_TARGET_CPU_CF_5208
 	select ADK_TARGET_BINFMT_FLAT
 	select ADK_TARGET_UCLINUX
 	select ADK_TARGET_KERNEL_ZIMAGE
diff --git a/target/m68k/systems/qemu-m68k-q800 b/target/m68k/systems/qemu-m68k-q800
index f576d3d91..f6d2b3785 100644
--- a/target/m68k/systems/qemu-m68k-q800
+++ b/target/m68k/systems/qemu-m68k-q800
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_M68K_Q800
 	bool "Qemu M68K (Q800)"
 	select ADK_TARGET_QEMU
-	select ADK_CPU_68040
+	select ADK_TARGET_CPU_M68K_68040
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/m68k/systems/toolchain-m68k b/target/m68k/systems/toolchain-m68k
deleted file mode 100644
index a10b5f532..000000000
--- a/target/m68k/systems/toolchain-m68k
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  M68K toolchain.
-
diff --git a/target/metag/systems/qemu-metag b/target/metag/systems/qemu-metag
index f6a45ef4a..9ddab0ea8 100644
--- a/target/metag/systems/qemu-metag
+++ b/target/metag/systems/qemu-metag
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_METAG
 	bool "Qemu Emulator"
-	select ADK_CPU_METAG
+	select ADK_TARGET_CPU_METAG
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_PACKAGE_TXZ
 	help
diff --git a/target/metag/systems/toolchain-metag b/target/metag/systems/toolchain-metag
deleted file mode 100644
index 3e7e4d338..000000000
--- a/target/metag/systems/toolchain-metag
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_METAG
-	bool "Toolchain only"
-	select ADK_CPU_METAG
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  METAG toolchain.
-
diff --git a/target/microblaze/systems/qemu-microblaze-ml605 b/target/microblaze/systems/qemu-microblaze-ml605
index 0a0fb522a..6cf372dfe 100644
--- a/target/microblaze/systems/qemu-microblaze-ml605
+++ b/target/microblaze/systems/qemu-microblaze-ml605
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605
 	bool "Qemu Emulator (Xilinx ML605)"
-	select ADK_CPU_MICROBLAZE
 	select ADK_TARGET_QEMU
+	select ADK_TARGET_CPU_MICROBLAZE
 	select ADK_TARGET_KERNEL_LINUXBIN
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/microblaze/systems/qemu-microblaze-s3adsp1800 b/target/microblaze/systems/qemu-microblaze-s3adsp1800
index 2a8fb2a84..8b9f72b47 100644
--- a/target/microblaze/systems/qemu-microblaze-s3adsp1800
+++ b/target/microblaze/systems/qemu-microblaze-s3adsp1800
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800
 	bool "Qemu Emulator (Xilinx Spartan S3ADSP1800)"
-	select ADK_CPU_MICROBLAZE
 	select ADK_TARGET_QEMU
+	select ADK_TARGET_CPU_MICROBLAZE
 	select ADK_TARGET_KERNEL_LINUXBIN
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/microblaze/systems/toolchain-microblaze b/target/microblaze/systems/toolchain-microblaze
deleted file mode 100644
index 8025ac4ec..000000000
--- a/target/microblaze/systems/toolchain-microblaze
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MICROBLAZE toolchain.
-
diff --git a/target/mips/kernel/generic-mips b/target/mips/kernel/generic-mips
new file mode 100644
index 000000000..a1b333ca5
--- /dev/null
+++ b/target/mips/kernel/generic-mips
@@ -0,0 +1 @@
+CONFIG_MIPS=y
diff --git a/target/mips/systems/dragino-ms14s b/target/mips/systems/dragino-ms14s
index 0ff60f233..5a91b3897 100644
--- a/target/mips/systems/dragino-ms14s
+++ b/target/mips/systems/dragino-ms14s
@@ -1,8 +1,8 @@
 config ADK_TARGET_SYSTEM_DRAGINO_MS14S
 	bool "Dragino2 ms14-s"
 	depends on ADK_EXPERIMENTAL
-	select ADK_CPU_MIPS32
-	select ADK_TARGET_BIG_ENDIAN
+	depends on ADK_TARGET_BIG_ENDIAN
+	select ADK_TARGET_CPU_MIPS_MIPS32
 	select ADK_TARGET_BOARD_ATH79
 	select ADK_TARGET_WITH_WATCHDOG
 	select ADK_TARGET_WITH_NAND
diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20
index a14761586..35ca91e3b 100644
--- a/target/mips/systems/imgtec-ci20
+++ b/target/mips/systems/imgtec-ci20
@@ -1,8 +1,8 @@
 config ADK_TARGET_SYSTEM_IMGTEC_CI20
 	bool "Imagination Creator CI20"
 	depends on ADK_EXPERIMENTAL
-	select ADK_CPU_MIPS32
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_MIPS_MIPS32
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_NAND
 	select ADK_TARGET_WITH_USB
diff --git a/target/mips/systems/mikrotik-rb4xx b/target/mips/systems/mikrotik-rb4xx
index 7baa64f16..c03c2ccd7 100644
--- a/target/mips/systems/mikrotik-rb4xx
+++ b/target/mips/systems/mikrotik-rb4xx
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
 	bool "Mikrotik Routerboard 4xx"
-	select ADK_CPU_MIPS32
-	select ADK_TARGET_BIG_ENDIAN
+	depends on ADK_TARGET_BIG_ENDIAN
+	select ADK_TARGET_CPU_MIPS_MIPS32
 	select ADK_TARGET_BOARD_ATH79
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532
index 62785260d..3d8c68454 100644
--- a/target/mips/systems/mikrotik-rb532
+++ b/target/mips/systems/mikrotik-rb532
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_MIKROTIK_RB532
 	bool "Mikrotik Routerboard 532"
-	select ADK_CPU_MIPS32
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_MIPS_MIPS32
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_MINIPCI
 	select ADK_TARGET_WITH_PCI
diff --git a/target/mips/systems/toolchain-mips b/target/mips/systems/toolchain-mips
deleted file mode 100644
index aefe0571d..000000000
--- a/target/mips/systems/toolchain-mips
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS toolchain.
-
diff --git a/target/mips64/kernel/generic-mips64 b/target/mips64/kernel/generic-mips64
new file mode 100644
index 000000000..a1b333ca5
--- /dev/null
+++ b/target/mips64/kernel/generic-mips64
@@ -0,0 +1 @@
+CONFIG_MIPS=y
diff --git a/target/mips64/systems/lemote-yeelong b/target/mips64/systems/lemote-yeelong
index 1512ecfd8..c25880d7c 100644
--- a/target/mips64/systems/lemote-yeelong
+++ b/target/mips64/systems/lemote-yeelong
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
 	bool "Lemote Yeelong laptop"
-	select ADK_CPU_LOONGSON2F
-	select ADK_TARGET_LITTLE_ENDIAN
+	depends on ADK_TARGET_LITTLE_ENDIAN
+	select ADK_TARGET_CPU_MIPS64_LOONGSON2F
 	select ADK_TARGET_WITH_USB_BOOT
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_PCI
diff --git a/target/mips64/systems/qemu-mips64 b/target/mips64/systems/qemu-mips64
index 2984fc14f..a528e3ebd 100644
--- a/target/mips64/systems/qemu-mips64
+++ b/target/mips64/systems/qemu-mips64
@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_QEMU_MIPS64
 	bool "Qemu Emulator"
-	select ADK_CPU_MIPS64
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_VMLINUZ
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/mips64/systems/toolchain-mips64 b/target/mips64/systems/toolchain-mips64
deleted file mode 100644
index 5b92b796a..000000000
--- a/target/mips64/systems/toolchain-mips64
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
-	bool "Toolchain only"
-	select ADK_CPU_MIPS64
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS64 toolchain.
-
diff --git a/target/moxie/systems/toolchain-moxie b/target/moxie/systems/toolchain-moxie
deleted file mode 100644
index 8176adf16..000000000
--- a/target/moxie/systems/toolchain-moxie
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MOXIE
-	bool "Toolchain only"
-	select ADK_CPU_MOXIE
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MOXIE toolchain.
-
diff --git a/target/nds32/systems/toolchain-nds32 b/target/nds32/systems/toolchain-nds32
deleted file mode 100644
index 268f5289c..000000000
--- a/target/nds32/systems/toolchain-nds32
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_NDS32
-	bool "Toolchain only"
-	select ADK_CPU_NDS32
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  NDS32 toolchain.
-
diff --git a/target/nios2/systems/toolchain-nios2 b/target/nios2/systems/toolchain-nios2
deleted file mode 100644
index 710b83097..000000000
--- a/target/nios2/systems/toolchain-nios2
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_NIOS2
-	bool "Toolchain only"
-	select ADK_CPU_NIOS2
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  NIOS2 toolchain.
-
diff --git a/target/or1k/systems/or1k-sim b/target/or1k/systems/or1k-sim
index 66087c98b..c28198a60 100644
--- a/target/or1k/systems/or1k-sim
+++ b/target/or1k/systems/or1k-sim
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_OR1K_SIM
 	bool "OR1K Simulator"
-	select ADK_CPU_OR1K
+	select ADK_TARGET_CPU_OR1K
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_KERNEL_VERSION_GIT
diff --git a/target/or1k/systems/qemu-or1k b/target/or1k/systems/qemu-or1k
index 78089917e..2fd2ed672 100644
--- a/target/or1k/systems/qemu-or1k
+++ b/target/or1k/systems/qemu-or1k
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_OR1K
 	bool "Qemu Emulator"
 	select ADK_TARGET_QEMU
-	select ADK_CPU_OR1K
+	select ADK_TARGET_CPU_OR1K
 	help
 	  Qemu Emulator for OR1K architecture.
 
diff --git a/target/or1k/systems/toolchain-or1k b/target/or1k/systems/toolchain-or1k
deleted file mode 100644
index ed7efccd1..000000000
--- a/target/or1k/systems/toolchain-or1k
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_OR1K
-	bool "Toolchain only"
-	select ADK_CPU_OR1K
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  OpenRISC toolchain.
-
diff --git a/target/ppc/kernel/generic-ppc b/target/ppc/kernel/generic-ppc
new file mode 100644
index 000000000..e22a7ab12
--- /dev/null
+++ b/target/ppc/kernel/generic-ppc
@@ -0,0 +1,2 @@
+CONFIG_PPC=y
+CONFIG_PPC32=y
diff --git a/target/ppc/systems/mac-mini b/target/ppc/systems/mac-mini
index ec7a60fa5..be327872c 100644
--- a/target/ppc/systems/mac-mini
+++ b/target/ppc/systems/mac-mini
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_APPLE_MACMINI
 	bool "Apple Mac mini"
 	depends on ADK_EXPERIMENTAL
-	select ADK_CPU_PPC
+	select ADK_TARGET_CPU_PPC
 	select ADK_TARGET_WITH_PCI
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
diff --git a/target/ppc/systems/qemu-ppc-bamboo b/target/ppc/systems/qemu-ppc-bamboo
index 0766495a1..b0d220a96 100644
--- a/target/ppc/systems/qemu-ppc-bamboo
+++ b/target/ppc/systems/qemu-ppc-bamboo
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_PPC_BAMBOO
 	bool "Qemu Emulator (Bamboo)"
 	select ADK_TARGET_QEMU
-	select ADK_CPU_PPC_440
+	select ADK_TARGET_CPU_PPC_440
 	select ADK_TARGET_SOFT_FLOAT
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/ppc/systems/qemu-ppc-macppc b/target/ppc/systems/qemu-ppc-macppc
index bd23c8f55..9afe1da56 100644
--- a/target/ppc/systems/qemu-ppc-macppc
+++ b/target/ppc/systems/qemu-ppc-macppc
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_PPC_MACPPC
 	bool "Qemu Emulator (MAC-PPC)"
 	select ADK_TARGET_QEMU
-	select ADK_CPU_PPC
+	select ADK_TARGET_CPU_PPC
 	select ADK_TARGET_CPU_WITH_FPU
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/ppc/systems/toolchain-ppc b/target/ppc/systems/toolchain-ppc
deleted file mode 100644
index 029fe42b1..000000000
--- a/target/ppc/systems/toolchain-ppc
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC
-	bool "Toolchain only"
-	select ADK_CPU_PPC
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  PPC toolchain.
-
diff --git a/target/ppc64/kernel/generic-ppc64 b/target/ppc64/kernel/generic-ppc64
new file mode 100644
index 000000000..0fe640692
--- /dev/null
+++ b/target/ppc64/kernel/generic-ppc64
@@ -0,0 +1 @@
+CONFIG_PPC64=y
diff --git a/target/ppc64/systems/qemu-ppc64 b/target/ppc64/systems/qemu-ppc64
index 8b1cda0c1..2be8e6b0a 100644
--- a/target/ppc64/systems/qemu-ppc64
+++ b/target/ppc64/systems/qemu-ppc64
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_PPC64
 	bool "Qemu Emulator"
-	select ADK_CPU_PPC64
+	select ADK_TARGET_CPU_PPC64_POWER7
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/ppc64/systems/toolchain-ppc64 b/target/ppc64/systems/toolchain-ppc64
deleted file mode 100644
index 78e30ef31..000000000
--- a/target/ppc64/systems/toolchain-ppc64
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  PPC64 toolchain.
-
diff --git a/target/qarch.lst b/target/qarch.lst
deleted file mode 100644
index 4e00da750..000000000
--- a/target/qarch.lst
+++ /dev/null
@@ -1,11 +0,0 @@
-arm
-microblaze
-mips
-mips64
-ppc
-ppc64
-sparc
-sparc64
-sh
-x86
-x86_64
diff --git a/target/s390/systems/qemu-s390 b/target/s390/systems/qemu-s390
index a2c1cdb9a..692f4a53c 100644
--- a/target/s390/systems/qemu-s390
+++ b/target/s390/systems/qemu-s390
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_S390
 	bool "Qemu Emulator"
-	select ADK_CPU_Z900
+	select ADK_TARGET_CPU_S390_Z900
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/s390/systems/toolchain-s390 b/target/s390/systems/toolchain-s390
deleted file mode 100644
index d441dfd94..000000000
--- a/target/s390/systems/toolchain-s390
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_S390
-	bool "Toolchain only"
-	select ADK_CPU_Z900
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  S390 toolchain.
-
diff --git a/target/sh/kernel/generic-sh b/target/sh/kernel/generic-sh
new file mode 100644
index 000000000..7793e5865
--- /dev/null
+++ b/target/sh/kernel/generic-sh
@@ -0,0 +1,2 @@
+CONFIG_SUPERH=y
+CONFIG_SUPERH32=y
diff --git a/target/sh/systems/numato-mimasv2 b/target/sh/systems/numato-mimasv2
index 07e234724..088fc5a73 100644
--- a/target/sh/systems/numato-mimasv2
+++ b/target/sh/systems/numato-mimasv2
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_NUMATO_MIMASV2
 	bool "Numato Mimas v2 FPGA"
-	select ADK_CPU_SH2
+	select ADK_TARGET_CPU_SH_SH2
 	select ADK_TARGET_WITH_SERIAL
 	help
 	  Support for Numato Mimas v2 FPGA with J2 Core Bitstream, sh2 architecture.
diff --git a/target/sh/systems/qemu-sh b/target/sh/systems/qemu-sh
index a190b3e73..e2f698c1a 100644
--- a/target/sh/systems/qemu-sh
+++ b/target/sh/systems/qemu-sh
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_SH
 	bool "Qemu Emulator"
-	select ADK_CPU_SH4
 	select ADK_TARGET_QEMU
+	select ADK_TARGET_CPU_SH_SH4
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/sh/systems/toolchain-sh b/target/sh/systems/toolchain-sh
deleted file mode 100644
index 3db0fcb1c..000000000
--- a/target/sh/systems/toolchain-sh
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_SH
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  SUPERH toolchain.
-
diff --git a/target/sparc/kernel/generic-sparc b/target/sparc/kernel/generic-sparc
new file mode 100644
index 000000000..fe345f093
--- /dev/null
+++ b/target/sparc/kernel/generic-sparc
@@ -0,0 +1,2 @@
+CONFIG_SPARC=y
+CONFIG_SPARC32=y
diff --git a/target/sparc/systems/qemu-sparc b/target/sparc/systems/qemu-sparc
index 402cbecee..90bc1da3c 100644
--- a/target/sparc/systems/qemu-sparc
+++ b/target/sparc/systems/qemu-sparc
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_SPARC
 	bool "Qemu Emulator"
-	select ADK_CPU_SPARC_V8
 	select ADK_TARGET_QEMU
+	select ADK_TARGET_CPU_SPARC_V8
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/sparc/systems/sun-voyager b/target/sparc/systems/sun-voyager
index d6c789b23..4b034acde 100644
--- a/target/sparc/systems/sun-voyager
+++ b/target/sparc/systems/sun-voyager
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_SUN_VOYAGER
 	bool "Sun Voyager"
 	depends on ADK_EXPERIMENTAL
-	select ADK_CPU_SPARC_V8
+	select ADK_TARGET_CPU_SPARC_V8
 	select ADK_TARGET_WITH_VGA
 	select ADK_TARGET_WITH_NET
 	select ADK_TARGET_WITH_NETDEVICE
diff --git a/target/sparc/systems/toolchain-sparc b/target/sparc/systems/toolchain-sparc
deleted file mode 100644
index 7346ab3cc..000000000
--- a/target/sparc/systems/toolchain-sparc
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  SPARC toolchain.
-
diff --git a/target/sparc64/kernel/generic-sparc64 b/target/sparc64/kernel/generic-sparc64
new file mode 100644
index 000000000..fa580e86a
--- /dev/null
+++ b/target/sparc64/kernel/generic-sparc64
@@ -0,0 +1,2 @@
+CONFIG_SPARC=y
+CONFIG_SPARC64=y
diff --git a/target/sparc64/systems/qemu-sparc64 b/target/sparc64/systems/qemu-sparc64
index e55d1737f..2174d7d97 100644
--- a/target/sparc64/systems/qemu-sparc64
+++ b/target/sparc64/systems/qemu-sparc64
@@ -1,7 +1,7 @@
 config ADK_TARGET_SYSTEM_QEMU_SPARC64
 	bool "Qemu Emulator"
-	select ADK_CPU_SPARC_V9
 	select ADK_TARGET_QEMU
+	select ADK_TARGET_CPU_SPARC64_V9
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
diff --git a/target/sparc64/systems/toolchain-sparc64 b/target/sparc64/systems/toolchain-sparc64
deleted file mode 100644
index 9a86635bf..000000000
--- a/target/sparc64/systems/toolchain-sparc64
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
-	bool "Toolchain only"
-	select ADK_CPU_SPARC_V9
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  SPARC64 toolchain.
-
diff --git a/target/tile/systems/toolchain-tile b/target/tile/systems/toolchain-tile
deleted file mode 100644
index 59cbed092..000000000
--- a/target/tile/systems/toolchain-tile
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_TILE
-	bool "Toolchain only"
-	select ADK_CPU_TILE
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  TILE toolchain.
-
diff --git a/target/v850/systems/toolchain-v850 b/target/v850/systems/toolchain-v850
deleted file mode 100644
index 0043bac74..000000000
--- a/target/v850/systems/toolchain-v850
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_V850
-	bool "Toolchain only"
-	select ADK_CPU_V850
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  V850 toolchain.
-
diff --git a/target/x86/systems/generic-x86 b/target/x86/systems/generic-x86
deleted file mode 100644
index ebe352908..000000000
--- a/target/x86/systems/generic-x86
+++ /dev/null
@@ -1,22 +0,0 @@
-config ADK_TARGET_SYSTEM_GENERIC_X86
-	bool "Generic x86 PC (i686)"
-	select ADK_CPU_I686
-	select ADK_TARGET_KERNEL_BZIMAGE
-	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	select ADK_TARGET_WITH_ACPI
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_SERIAL
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_NET
-	select ADK_TARGET_WITH_NETDEVICE
-	select ADK_TARGET_WITH_BLOCK
-	select ADK_TARGET_WITH_PATA
-	select ADK_TARGET_WITH_SATA
-	select ADK_TARGET_WITH_IOMMU
-	select ADK_TARGET_CPU_WITH_MTRR
-	select ADK_PACKAGE_GRUB
-	help
-	  Example config for generic i686 based PC.
-          You need to enable all required drivers manually.
-
diff --git a/target/x86/systems/ibm-x40 b/target/x86/systems/ibm-x40
index 6cbc55eae..415e34598 100644
--- a/target/x86/systems/ibm-x40
+++ b/target/x86/systems/ibm-x40
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_IBM_X40
 	bool "IBM X40 laptop"
-	select ADK_CPU_PENTIUM_M
+	select ADK_TARGET_CPU_X86_PENTIUM_M
 	select ADK_TARGET_CPU_WITH_MMX
 	select ADK_TARGET_CPU_WITH_SSE
 	select ADK_TARGET_CPU_WITH_SSE2
diff --git a/target/x86/systems/pcengines-alix b/target/x86/systems/pcengines-alix
index 6dd775743..ae0f13720 100644
--- a/target/x86/systems/pcengines-alix
+++ b/target/x86/systems/pcengines-alix
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_PCENGINES_ALIX
 	bool "PCengines ALIX"
-	select ADK_CPU_GEODE
+	select ADK_TARGET_CPU_X86_GEODE
 	select ADK_TARGET_WITH_SERIAL
 	select ADK_TARGET_WITH_USB
 	select ADK_TARGET_WITH_PCI
diff --git a/target/x86/systems/qemu-x86 b/target/x86/systems/qemu-x86
index 97c1a6437..8d99218fc 100644
--- a/target/x86/systems/qemu-x86
+++ b/target/x86/systems/qemu-x86
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_X86
 	bool "Qemu Emulator"
-	select ADK_CPU_I686
+	select ADK_TARGET_CPU_X86_I686
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/x86/systems/toolchain-x86 b/target/x86/systems/toolchain-x86
deleted file mode 100644
index aa30ffea2..000000000
--- a/target/x86/systems/toolchain-x86
+++ /dev/null
@@ -1,7 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_X86
-	bool "Toolchain only"
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  X86 toolchain.
-
diff --git a/target/x86_64/systems/generic-x86_64 b/target/x86_64/systems/generic-x86_64
deleted file mode 100644
index ba6dc0f37..000000000
--- a/target/x86_64/systems/generic-x86_64
+++ /dev/null
@@ -1,22 +0,0 @@
-config ADK_TARGET_SYSTEM_GENERIC_X86_64
-	bool "Generic x86_64 PC"
-	select ADK_TARGET_KERNEL_BZIMAGE
-	select ADK_TARGET_KERNEL_WITH_COMPRESSION
-	select ADK_TARGET_WITH_ACPI
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_SERIAL
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_NET
-	select ADK_TARGET_WITH_NETDEVICE
-	select ADK_TARGET_WITH_BLOCK
-	select ADK_TARGET_WITH_PATA
-	select ADK_TARGET_WITH_SATA
-	select ADK_TARGET_WITH_IOMMU
-	select ADK_TARGET_WITH_SMP
-	select ADK_TARGET_CPU_WITH_MTRR
-	select ADK_PACKAGE_GRUB
-	help
-	  Example config for generic x86_64 based PC.
-          You need to enable all required drivers manually.
-
diff --git a/target/x86_64/systems/pcengines-apu b/target/x86_64/systems/pcengines-apu
index 3d381b609..3a42ea8c7 100644
--- a/target/x86_64/systems/pcengines-apu
+++ b/target/x86_64/systems/pcengines-apu
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_PCENGINES_APU
 	bool "PC Engines APU"
-	select ADK_CPU_AMD_BOBCAT
+	select ADK_TARGET_CPU_X86_64_BTVER1
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_TARGET_WITH_MINIPCI
diff --git a/target/x86_64/systems/qemu-x86_64 b/target/x86_64/systems/qemu-x86_64
index 7fb201931..2ae2fc46b 100644
--- a/target/x86_64/systems/qemu-x86_64
+++ b/target/x86_64/systems/qemu-x86_64
@@ -1,6 +1,6 @@
 config ADK_TARGET_SYSTEM_QEMU_X86_64
 	bool "Qemu Emulator"
-	select ADK_CPU_NOCONA
+	select ADK_TARGET_CPU_X86_64_NOCONA
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_BZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/x86_64/systems/toolchain-x86_64 b/target/x86_64/systems/toolchain-x86_64
deleted file mode 100644
index de11ff163..000000000
--- a/target/x86_64/systems/toolchain-x86_64
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_X86_64
-	bool "Toolchain only"
-	select ADK_CPU_X86_64
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  X86_64 toolchain.
-
diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile
index 4643854d4..b5db1376d 100644
--- a/target/xtensa/Makefile
+++ b/target/xtensa/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
 include $(ADK_TOPDIR)/mk/kernel-build.mk
 include $(ADK_TOPDIR)/mk/image.mk
 
-ifeq ($(ADK_TARGET_XTENSA_DE212),y)
+ifeq ($(ADK_TARGET_CPU_XTENSA_DE212),y)
 KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf
 else
 KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage
@@ -13,13 +13,13 @@ endif
 
 QEMU_ARGS:=-M ml605 -monitor null
 QEMU_ARGS+=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_XTENSA_DC233C),y)
+ifeq ($(ADK_TARGET_CPU_XTENSA_DC233C),y)
 QEMU_ARGS+=-cpu dc233c
 endif
-ifeq ($(ADK_TARGET_XTENSA_DC232B),y)
+ifeq ($(ADK_TARGET_CPU_XTENSA_DC232B),y)
 QEMU_ARGS+=-cpu dc232b
 endif
-ifeq ($(ADK_TARGET_XTENSA_DE212),y)
+ifeq ($(ADK_TARGET_CPU_XTENSA_DE212),y)
 QEMU_ARGS+=-cpu de212
 endif
 
diff --git a/target/xtensa/systems/qemu-xtensa b/target/xtensa/systems/qemu-xtensa
index 1ae3cd111..53d6daba7 100644
--- a/target/xtensa/systems/qemu-xtensa
+++ b/target/xtensa/systems/qemu-xtensa
@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_QEMU_XTENSA
 	bool "Qemu Emulator"
-	select ADK_CPU_XTENSA
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_HOST_BUILD_U_BOOT
diff --git a/target/xtensa/systems/toolchain-xtensa b/target/xtensa/systems/toolchain-xtensa
deleted file mode 100644
index 1109bc60e..000000000
--- a/target/xtensa/systems/toolchain-xtensa
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_XTENSA
-	bool "Toolchain only"
-	select ADK_CPU_XTENSA
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  XTENSA toolchain.
-
diff --git a/target/xtensa/systems/xilinx-kintex7 b/target/xtensa/systems/xilinx-kintex7
index 4476e5230..341153efe 100644
--- a/target/xtensa/systems/xilinx-kintex7
+++ b/target/xtensa/systems/xilinx-kintex7
@@ -1,6 +1,5 @@
 config ADK_TARGET_SYSTEM_XILINX_KINTEX7
 	bool "Xilinx Kintex 7"
-	select ADK_CPU_XTENSA
 	select ADK_TARGET_KERNEL_ZIMAGE
 	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	select ADK_TARGET_WITH_SERIAL
diff --git a/target/appliances/000default.appliance b/tasks/000-new
index 5ebe90e7e..5ebe90e7e 100644
--- a/target/appliances/000default.appliance
+++ b/tasks/000-new
diff --git a/tasks/001-toolchain b/tasks/001-toolchain
new file mode 100644
index 000000000..48b544a90
--- /dev/null
+++ b/tasks/001-toolchain
@@ -0,0 +1,5 @@
+config ADK_APPLIANCE_TOOLCHAIN
+	bool "create a toolchain"
+	help
+	  Create a toolchain.
+
diff --git a/target/appliances/mpd.appliance b/tasks/002-mpd
index 1be44db3a..683e6cd80 100644
--- a/target/appliances/mpd.appliance
+++ b/tasks/002-mpd
@@ -1,5 +1,6 @@
 config ADK_APPLIANCE_MPD
 	bool "music player daemon appliance"
+	depends on ADK_TARGET_OS_LINUX
 	select ADK_PACKAGE_MPD
 	select ADK_PACKAGE_MPD_WITH_ALSA
 	select ADK_PACKAGE_MPD_WITH_MP3
diff --git a/target/appliances/kodi.appliance b/tasks/003-kodi
index 041ccddf8..064c4e5a8 100644
--- a/target/appliances/kodi.appliance
+++ b/tasks/003-kodi
@@ -1,11 +1,15 @@
 config ADK_APPLIANCE_KODI
 	bool "kodi multimedia appliance"
-	select ADK_TARGET_LIB_GLIBC if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+	depends on ADK_TARGET_OS_LINUX && (\
+		ADK_TARGET_SYSTEM_RASPBERRY_PI || \
+		ADK_TARGET_SYSTEM_RASPBERRY_PI2 || \
+		ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 )
 	select ADK_PACKAGE_GLIBC if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_GLIBC_GCONV if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBICONV if ADK_TARGET_LIB_UCLIBC_NG
 	select ADK_TARGET_LIBICONV if ADK_TARGET_LIB_UCLIBC_NG
 	select ADK_PACKAGE_KODI
+	select ADK_PACKAGE_PYTHON2	
 	select ADK_PACKAGE_PYTHON2_MOD_ZLIB # required for YouTube Addon
 	select ADK_PACKAGE_PYTHON2_MOD_SSL # required for YouTube Addon
 	select ADK_PACKAGE_PYTHON2_MOD_EXPAT # required for Mediathek Addon
diff --git a/target/appliances/development.appliance b/tasks/004-development
index 760b68801..e7d22d73a 100644
--- a/target/appliances/development.appliance
+++ b/tasks/004-development
@@ -1,5 +1,6 @@
 config ADK_APPLIANCE_DEVELOPMENT
 	bool "development appliance"
+	depends on ADK_TARGET_OS_LINUX
 	select ADK_PACKAGE_GCC
 	select ADK_PACKAGE_GXX
 	select ADK_PACKAGE_BINUTILS
diff --git a/target/appliances/firefox.appliance b/tasks/005-firefox
index 08f5d8876..364ab6686 100644
--- a/target/appliances/firefox.appliance
+++ b/tasks/005-firefox
@@ -1,5 +1,8 @@
 config ADK_APPLIANCE_FIREFOX
 	bool "firefox kiosk appliance"
+	depends on ADK_TARGET_OS_LINUX && ( \
+		ADK_TARGET_SYSTEM_LEMOTE_YEELONG || \
+		ADK_TARGET_SYSTEM_IBM_X40 )
 	select ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_GLIBC
 	select ADK_PACKAGE_FIREFOX
diff --git a/target/appliances/test.appliance b/tasks/006-test
index 57b156acd..9ba6561fd 100644
--- a/target/appliances/test.appliance
+++ b/tasks/006-test
@@ -1,5 +1,6 @@
 config ADK_APPLIANCE_TEST
 	bool "automatic test system appliance"
+	depends on ADK_TARGET_OS_LINUX
 	select ADK_PACKAGE_ADKTEST
 	select ADK_RUNTIME_START_SERVICES
 	select ADK_RUNTIME_START_ADKTEST
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 78e293ea4..091d62c3d 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -24,7 +24,7 @@ else
 CONFOPTS+=		--disable-gold
 endif
 
-ifeq ($(ADK_TARGET_ARCH_X86_64)$(ADK_CPU_CF),)
+ifeq ($(ADK_TARGET_ARCH_X86_64)$(ADK_TARGET_CPU_CF),)
 CONFOPTS+=		--disable-multilib
 else
 CONFOPTS+=		--enable-multilib
@@ -40,7 +40,7 @@ endif
 
 $(WRKBUILD)/.configured:
 ifeq ($(ADK_TARGET_ARCH_XTENSA),y)
-	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_XTENSA).tar \
+	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE).tar \
 		--strip-components=1 -C $(WRKSRC) binutils
 endif
 	(cd $(WRKBUILD); \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 89d87d69a..1fe6294ae 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -122,7 +122,7 @@ ifeq ($(ADK_TARGET_ARCH_METAG),y)
 GCC_CONFOPTS+=		--with-cpu=2.1 --enable-meta-default --disable-symvers
 endif
 
-ifeq ($(ADK_CPU_CF),y)
+ifeq ($(ADK_TARGET_CPU_CF),y)
 GCC_CONFOPTS+=		--enable-multilib --with-arch=cf
 endif
 
@@ -136,19 +136,19 @@ GCC_CONFOPTS+=		--with-endian=little
 else
 GCC_CONFOPTS+=          --with-endian=big
 endif
-ifeq ($(ADK_CPU_SH2),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH2),y)
 GCC_FINAL_CONFOPTS+=	--with-multilib-list=m2
 endif
-ifeq ($(ADK_CPU_SH2A),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH2A),y)
 GCC_FINAL_CONFOPTS+=	--with-multilib-list=m2a
 endif
-ifeq ($(ADK_CPU_SH3),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
 GCC_FINAL_CONFOPTS+=	--with-multilib-list=m3
 endif
-ifeq ($(ADK_CPU_SH4),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH4),y)
 GCC_FINAL_CONFOPTS+=	--with-multilib-list=m4,m4-nofpu
 endif
-ifeq ($(ADK_CPU_SH4A),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH4A),y)
 GCC_FINAL_CONFOPTS+=	--with-multilib-list=m4a,m4a-nofpu
 endif
 endif
@@ -202,7 +202,7 @@ GCC_BUILD_DIR_FINAL:=	$(WRKBUILD)-final
 
 $(GCC_BUILD_DIR_INITIAL)/.configured:
 ifeq ($(ADK_TARGET_ARCH_XTENSA),y)
-	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_XTENSA).tar \
+	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE).tar \
 		--strip-components=1 -C $(WRKSRC) gcc
 endif
 	mkdir -p $(GCC_BUILD_DIR_INITIAL)
@@ -215,13 +215,13 @@ endif
 	(cd $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME); \
 		ln -s ../$(STAGING_HOST2TARGET)/usr/lib lib)
 ifeq ($(ADK_TARGET_ARCH_SH),y)
-ifeq ($(ADK_CPU_SH3),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
 	(cd ${STAGING_TARGET_DIR}/ && ln -sf . m3)
 endif
-ifeq ($(ADK_CPU_SH4),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH4),y)
 	(cd ${STAGING_TARGET_DIR}/ && ln -sf . m4)
 endif
-ifeq ($(ADK_CPU_SH4A),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH4A),y)
 	(cd ${STAGING_TARGET_DIR}/ && ln -sf . m4a)
 endif
 endif
diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile
index fccf2a034..13dd3b02d 100644
--- a/toolchain/kernel-headers/Makefile
+++ b/toolchain/kernel-headers/Makefile
@@ -21,7 +21,7 @@ ifeq ($(ADK_KERNEL_ROOT_NFS),y)
 endif
 endif
 ifeq ($(ADK_TARGET_ARCH_XTENSA),y)
-	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_XTENSA).tar \
+	tar xf $(ADK_TOPDIR)/target/xtensa/overlay/xtensa_$(ADK_TARGET_CPU_TYPE).tar \
 		--strip-components=1 -C $(WRKSRC) linux
 endif
 ifneq ($(ADK_DISABLE_KERNEL_PATCHES),y)
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile
index 146f928c8..e3269d029 100644
--- a/toolchain/uclibc-ng/Makefile
+++ b/toolchain/uclibc-ng/Makefile
@@ -145,11 +145,11 @@ endif
 
 # arc
 ifeq ($(ADK_TARGET_ARCH_ARC),y)
-ifeq ($(ADK_CPU_ARC700),y)
+ifeq ($(ADK_TARGET_CPU_ARC_ARC700),y)
 	$(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/\1=y/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_CPU_ARC_HS),y)
+ifeq ($(ADK_TARGET_CPU_ARC_ARC_HS),y)
 	$(SED) 's/.*\(CONFIG_ARC_CPU_700\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_ARC_CPU_HS\).*/\1=y/' ${WRKBUILD}/.config
 endif
@@ -168,11 +168,11 @@ endif
 
 # cris
 ifeq ($(ADK_TARGET_ARCH_CRIS),y)
-ifeq ($(ADK_CPU_CRIS_V32),y)
+ifeq ($(ADK_TARGET_CPU_CRIS_CRISV32),y)
 	$(SED) 's/.*\(CONFIG_CRIS=\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_CRISV32\).*/\1=y/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_CPU_CRIS_V10),y)
+ifeq ($(ADK_TARGET_CPU_CRIS_CRISV10),y)
 	$(SED) 's/.*\(CONFIG_CRIS=\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_CRISV32\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
@@ -180,23 +180,21 @@ endif
 
 # sh
 ifeq ($(ADK_TARGET_ARCH_SH),y)
-ifeq ($(ADK_CPU_SH4A),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH4A),y)
 	$(SED) 's/.*\(CONFIG_SH2A\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH2\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH3\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH4=\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH4A\).*/\1=y/' ${WRKBUILD}/.config
-	echo foo
-	cat ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_CPU_SH4),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH4),y)
 	$(SED) 's/.*\(CONFIG_SH2A\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH2\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH3\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH4A\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH4\).*/\1=y/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_CPU_SH3),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH3),y)
 	$(SED) 's/.*\(UCLIBC_HAS_FPU\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH2A\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH2\).*/# \1 is not set/' ${WRKBUILD}/.config
@@ -204,7 +202,7 @@ ifeq ($(ADK_CPU_SH3),y)
 	$(SED) 's/.*\(CONFIG_SH4A\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH3\).*/\1=y/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_CPU_SH2),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH2),y)
 	$(SED) 's/.*\(UCLIBC_HAS_FPU\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH2A\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH3\).*/# \1 is not set/' ${WRKBUILD}/.config
@@ -212,7 +210,7 @@ ifeq ($(ADK_CPU_SH2),y)
 	$(SED) 's/.*\(CONFIG_SH4A\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH2\).*/\1=y/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_CPU_SH2A),y)
+ifeq ($(ADK_TARGET_CPU_SH_SH2A),y)
 	$(SED) 's/.*\(UCLIBC_HAS_FPU\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH2A\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_SH3\).*/# \1 is not set/' ${WRKBUILD}/.config
@@ -224,24 +222,24 @@ endif
 
 # x86
 ifeq ($(ADK_TARGET_ARCH_X86),y)
-ifeq ($(ADK_CPU_I486),y)
+ifeq ($(ADK_TARGET_CPU_X86_I486),y)
 	$(SED) 's/.*\(CONFIG_686\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_586\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_486\).*/\1=y/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_CPU_I586),y)
+ifeq ($(ADK_TARGET_CPU_X86_I586),y)
 	$(SED) 's/.*\(CONFIG_686\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_586\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_486\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
-ifeq ($(ADK_CPU_I686),y)
+ifeq ($(ADK_TARGET_CPU_X86_I686),y)
 	$(SED) 's/.*\(CONFIG_686\).*/\1=y/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_586\).*/# \1 is not set/' ${WRKBUILD}/.config
 	$(SED) 's/.*\(CONFIG_486\).*/# \1 is not set/' ${WRKBUILD}/.config
 endif
 endif
 
-# mips64
+# mips64 abi
 ifeq ($(ADK_TARGET_ARCH_MIPS64),y)
 ifeq ($(ADK_TARGET_ABI_N64),y)
 	$(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/\1=y/' ${WRKBUILD}/.config