From f89ae854544e3667244336c9b507b3dcc43fb5ae Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 23 May 2014 17:14:57 +0200
Subject: more cleanup, *-enabled feature is unused, simplify

---
 target/aarch64/sys-available/arm-fm                | 13 -----
 target/aarch64/sys-available/toolchain-aarch64     | 14 ------
 target/aarch64/systems/arm-fm                      | 13 +++++
 target/aarch64/systems/toolchain-aarch64           | 14 ++++++
 target/arm/sys-available/acmesystems-foxg20        | 17 -------
 target/arm/sys-available/cubox-i                   | 26 ----------
 target/arm/sys-available/keyasic-ka2000            | 16 ------
 target/arm/sys-available/qemu-arm                  | 10 ----
 target/arm/sys-available/raspberry-pi              | 20 --------
 target/arm/sys-available/sharp-zaurus              | 16 ------
 target/arm/sys-available/toolchain-arm             | 10 ----
 target/arm/systems/cubox-i                         | 26 ++++++++++
 target/arm/systems/keyasic-ka2000                  | 16 ++++++
 target/arm/systems/qemu-arm                        | 11 +++++
 target/arm/systems/raspberry-pi                    | 20 ++++++++
 target/arm/systems/sharp-zaurus                    | 17 +++++++
 target/arm/systems/toolchain-arm                   | 10 ++++
 target/collections/console                         | 33 +++++++++++++
 target/collections/development                     | 40 +++++++++++++++
 target/collections/mpdbox                          | 57 ++++++++++++++++++++++
 target/collections/test                            | 20 ++++++++
 target/collections/xorg                            | 27 ++++++++++
 target/config/Config.in.arch                       |  2 +
 target/config/Config.in.system                     |  2 +
 target/m68k/sys-available/aranym-m68k              | 11 -----
 target/m68k/sys-available/toolchain-m68k           |  9 ----
 target/m68k/systems/aranym-m68k                    | 11 +++++
 target/m68k/systems/toolchain-m68k                 |  9 ++++
 target/microblaze/sys-available/qemu-microblaze    |  9 ----
 .../microblaze/sys-available/toolchain-microblaze  |  9 ----
 target/microblaze/systems/qemu-microblaze          |  9 ++++
 target/microblaze/systems/toolchain-microblaze     |  9 ++++
 target/mips/sys-available/broadcom-bcm47xx         | 12 -----
 target/mips/sys-available/fon-fon2100              | 12 -----
 target/mips/sys-available/linksys-ag241            | 16 ------
 target/mips/sys-available/mikrotik-rb4xx           | 12 -----
 target/mips/sys-available/mikrotik-rb532           | 14 ------
 target/mips/sys-available/qemu-mips                |  9 ----
 target/mips/sys-available/toolchain-mips           |  9 ----
 target/mips/systems/mikrotik-rb532                 | 14 ++++++
 target/mips/systems/qemu-mips                      |  9 ++++
 target/mips/systems/toolchain-mips                 |  9 ++++
 target/mips64/sys-available/lemote-yeelong         | 19 --------
 target/mips64/sys-available/qemu-mips64            | 11 -----
 target/mips64/sys-available/toolchain-mips64       | 11 -----
 target/mips64/systems/lemote-yeelong               | 19 ++++++++
 target/mips64/systems/qemu-mips64                  | 11 +++++
 target/mips64/systems/toolchain-mips64             | 11 +++++
 target/packages/pkg-available/console              | 33 -------------
 target/packages/pkg-available/development          | 40 ---------------
 target/packages/pkg-available/mpdbox               | 57 ----------------------
 target/packages/pkg-available/test                 | 20 --------
 target/packages/pkg-available/xorg                 | 27 ----------
 target/ppc/sys-available/qemu-ppc                  |  9 ----
 target/ppc/sys-available/toolchain-ppc             | 10 ----
 target/ppc/systems/qemu-ppc                        |  9 ++++
 target/ppc/systems/toolchain-ppc                   | 10 ++++
 target/ppc64/sys-available/qemu-ppc64              | 10 ----
 target/ppc64/sys-available/toolchain-ppc64         | 11 -----
 target/ppc64/systems/qemu-ppc64                    | 10 ++++
 target/ppc64/systems/toolchain-ppc64               | 11 +++++
 target/sh/sys-available/qemu-sh4                   | 10 ----
 target/sh/sys-available/toolchain-sh4              | 10 ----
 target/sh/systems/qemu-sh4                         | 10 ++++
 target/sh/systems/toolchain-sh4                    | 10 ++++
 target/sparc/sys-available/qemu-sparc              | 10 ----
 target/sparc/sys-available/toolchain-sparc         | 10 ----
 target/sparc/systems/qemu-sparc                    | 10 ++++
 target/sparc/systems/toolchain-sparc               | 10 ++++
 target/sparc64/sys-available/qemu-sparc64          | 10 ----
 target/sparc64/sys-available/toolchain-sparc64     | 11 -----
 target/sparc64/systems/qemu-sparc64                | 11 +++++
 target/sparc64/systems/toolchain-sparc64           | 11 +++++
 target/x86/sys-available/generic-pc                |  9 ----
 target/x86/sys-available/ibm-x40                   | 29 -----------
 target/x86/sys-available/pcengines-alix1c          | 23 ---------
 target/x86/sys-available/pcengines-alix2d13        | 19 --------
 target/x86/sys-available/pcengines-alix2d2         | 19 --------
 target/x86/sys-available/pcengines-wrap            | 13 -----
 target/x86/sys-available/qemu-x86                  |  9 ----
 target/x86/sys-available/toolchain-x86             |  9 ----
 target/x86/sys-available/vbox-i686                 | 15 ------
 target/x86/systems/generic-pc                      |  9 ++++
 target/x86/systems/ibm-x40                         | 29 +++++++++++
 target/x86/systems/qemu-x86                        |  9 ++++
 target/x86/systems/toolchain-x86                   |  9 ++++
 target/x86/systems/vbox-i686                       | 15 ++++++
 target/x86_64/sys-available/qemu-x86_64            | 11 -----
 target/x86_64/sys-available/toolchain-x86_64       | 11 -----
 target/x86_64/systems/qemu-x86_64                  | 11 +++++
 target/x86_64/systems/toolchain-x86_64             | 11 +++++
 91 files changed, 614 insertions(+), 750 deletions(-)
 delete mode 100644 target/aarch64/sys-available/arm-fm
 delete mode 100644 target/aarch64/sys-available/toolchain-aarch64
 create mode 100644 target/aarch64/systems/arm-fm
 create mode 100644 target/aarch64/systems/toolchain-aarch64
 delete mode 100644 target/arm/sys-available/acmesystems-foxg20
 delete mode 100644 target/arm/sys-available/cubox-i
 delete mode 100644 target/arm/sys-available/keyasic-ka2000
 delete mode 100644 target/arm/sys-available/qemu-arm
 delete mode 100644 target/arm/sys-available/raspberry-pi
 delete mode 100644 target/arm/sys-available/sharp-zaurus
 delete mode 100644 target/arm/sys-available/toolchain-arm
 create mode 100644 target/arm/systems/cubox-i
 create mode 100644 target/arm/systems/keyasic-ka2000
 create mode 100644 target/arm/systems/qemu-arm
 create mode 100644 target/arm/systems/raspberry-pi
 create mode 100644 target/arm/systems/sharp-zaurus
 create mode 100644 target/arm/systems/toolchain-arm
 create mode 100644 target/collections/console
 create mode 100644 target/collections/development
 create mode 100644 target/collections/mpdbox
 create mode 100644 target/collections/test
 create mode 100644 target/collections/xorg
 create mode 100644 target/config/Config.in.arch
 create mode 100644 target/config/Config.in.system
 delete mode 100644 target/m68k/sys-available/aranym-m68k
 delete mode 100644 target/m68k/sys-available/toolchain-m68k
 create mode 100644 target/m68k/systems/aranym-m68k
 create mode 100644 target/m68k/systems/toolchain-m68k
 delete mode 100644 target/microblaze/sys-available/qemu-microblaze
 delete mode 100644 target/microblaze/sys-available/toolchain-microblaze
 create mode 100644 target/microblaze/systems/qemu-microblaze
 create mode 100644 target/microblaze/systems/toolchain-microblaze
 delete mode 100644 target/mips/sys-available/broadcom-bcm47xx
 delete mode 100644 target/mips/sys-available/fon-fon2100
 delete mode 100644 target/mips/sys-available/linksys-ag241
 delete mode 100644 target/mips/sys-available/mikrotik-rb4xx
 delete mode 100644 target/mips/sys-available/mikrotik-rb532
 delete mode 100644 target/mips/sys-available/qemu-mips
 delete mode 100644 target/mips/sys-available/toolchain-mips
 create mode 100644 target/mips/systems/mikrotik-rb532
 create mode 100644 target/mips/systems/qemu-mips
 create mode 100644 target/mips/systems/toolchain-mips
 delete mode 100644 target/mips64/sys-available/lemote-yeelong
 delete mode 100644 target/mips64/sys-available/qemu-mips64
 delete mode 100644 target/mips64/sys-available/toolchain-mips64
 create mode 100644 target/mips64/systems/lemote-yeelong
 create mode 100644 target/mips64/systems/qemu-mips64
 create mode 100644 target/mips64/systems/toolchain-mips64
 delete mode 100644 target/packages/pkg-available/console
 delete mode 100644 target/packages/pkg-available/development
 delete mode 100644 target/packages/pkg-available/mpdbox
 delete mode 100644 target/packages/pkg-available/test
 delete mode 100644 target/packages/pkg-available/xorg
 delete mode 100644 target/ppc/sys-available/qemu-ppc
 delete mode 100644 target/ppc/sys-available/toolchain-ppc
 create mode 100644 target/ppc/systems/qemu-ppc
 create mode 100644 target/ppc/systems/toolchain-ppc
 delete mode 100644 target/ppc64/sys-available/qemu-ppc64
 delete mode 100644 target/ppc64/sys-available/toolchain-ppc64
 create mode 100644 target/ppc64/systems/qemu-ppc64
 create mode 100644 target/ppc64/systems/toolchain-ppc64
 delete mode 100644 target/sh/sys-available/qemu-sh4
 delete mode 100644 target/sh/sys-available/toolchain-sh4
 create mode 100644 target/sh/systems/qemu-sh4
 create mode 100644 target/sh/systems/toolchain-sh4
 delete mode 100644 target/sparc/sys-available/qemu-sparc
 delete mode 100644 target/sparc/sys-available/toolchain-sparc
 create mode 100644 target/sparc/systems/qemu-sparc
 create mode 100644 target/sparc/systems/toolchain-sparc
 delete mode 100644 target/sparc64/sys-available/qemu-sparc64
 delete mode 100644 target/sparc64/sys-available/toolchain-sparc64
 create mode 100644 target/sparc64/systems/qemu-sparc64
 create mode 100644 target/sparc64/systems/toolchain-sparc64
 delete mode 100644 target/x86/sys-available/generic-pc
 delete mode 100644 target/x86/sys-available/ibm-x40
 delete mode 100644 target/x86/sys-available/pcengines-alix1c
 delete mode 100644 target/x86/sys-available/pcengines-alix2d13
 delete mode 100644 target/x86/sys-available/pcengines-alix2d2
 delete mode 100644 target/x86/sys-available/pcengines-wrap
 delete mode 100644 target/x86/sys-available/qemu-x86
 delete mode 100644 target/x86/sys-available/toolchain-x86
 delete mode 100644 target/x86/sys-available/vbox-i686
 create mode 100644 target/x86/systems/generic-pc
 create mode 100644 target/x86/systems/ibm-x40
 create mode 100644 target/x86/systems/qemu-x86
 create mode 100644 target/x86/systems/toolchain-x86
 create mode 100644 target/x86/systems/vbox-i686
 delete mode 100644 target/x86_64/sys-available/qemu-x86_64
 delete mode 100644 target/x86_64/sys-available/toolchain-x86_64
 create mode 100644 target/x86_64/systems/qemu-x86_64
 create mode 100644 target/x86_64/systems/toolchain-x86_64

(limited to 'target')

diff --git a/target/aarch64/sys-available/arm-fm b/target/aarch64/sys-available/arm-fm
deleted file mode 100644
index 4eef2aeaf..000000000
--- a/target/aarch64/sys-available/arm-fm
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_TARGET_SYSTEM_ARM_FM
-	bool "ARMv8 Foundation Model"
-	select ADK_aarch64
-	select ADK_arm_fm
-	select ADK_little
-	select ADK_soft_float
-	select ADK_eabi
-	select ADK_CPU_ARMV8
-	select ADK_LINUX_64
-	select ADK_TARGET_KERNEL_IMAGE
-	select ADK_PACKAGE_BOOT_WRAPPER_AARCH64
-	help
-	 Support for ARMv8 Foundation Model (aarch64).
diff --git a/target/aarch64/sys-available/toolchain-aarch64 b/target/aarch64/sys-available/toolchain-aarch64
deleted file mode 100644
index bcdfd2289..000000000
--- a/target/aarch64/sys-available/toolchain-aarch64
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
-	bool "Toolchain only (little endian)"
-	select ADK_aarch64
-	select ADK_toolchain_aarch64
-	select ADK_little
-	select ADK_soft_float
-	select ADK_fpu_vfp
-	select ADK_eabi
-	select ADK_CPU_ARMV8
-	select ADK_LINUX_64
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  AARCH64 toolchain.
diff --git a/target/aarch64/systems/arm-fm b/target/aarch64/systems/arm-fm
new file mode 100644
index 000000000..4eef2aeaf
--- /dev/null
+++ b/target/aarch64/systems/arm-fm
@@ -0,0 +1,13 @@
+config ADK_TARGET_SYSTEM_ARM_FM
+	bool "ARMv8 Foundation Model"
+	select ADK_aarch64
+	select ADK_arm_fm
+	select ADK_little
+	select ADK_soft_float
+	select ADK_eabi
+	select ADK_CPU_ARMV8
+	select ADK_LINUX_64
+	select ADK_TARGET_KERNEL_IMAGE
+	select ADK_PACKAGE_BOOT_WRAPPER_AARCH64
+	help
+	 Support for ARMv8 Foundation Model (aarch64).
diff --git a/target/aarch64/systems/toolchain-aarch64 b/target/aarch64/systems/toolchain-aarch64
new file mode 100644
index 000000000..15a106e42
--- /dev/null
+++ b/target/aarch64/systems/toolchain-aarch64
@@ -0,0 +1,14 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
+	bool "Toolchain only"
+	select ADK_aarch64
+	select ADK_toolchain_aarch64
+	select ADK_little
+	select ADK_soft_float
+	select ADK_fpu_vfp
+	select ADK_eabi
+	select ADK_CPU_ARMV8
+	select ADK_LINUX_64
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  AARCH64 toolchain.
diff --git a/target/arm/sys-available/acmesystems-foxg20 b/target/arm/sys-available/acmesystems-foxg20
deleted file mode 100644
index d473e199e..000000000
--- a/target/arm/sys-available/acmesystems-foxg20
+++ /dev/null
@@ -1,17 +0,0 @@
-config ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
-	bool "Foxboard FOXG20"
-	select ADK_arm
-	select ADK_little
-	select ADK_soft_float
-	select ADK_eabi
-	select ADK_acmesystems_foxg20
-	select ADK_KERNEL_AEABI
-	select ADK_TARGET_WITH_SD
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_KERNEL_IMAGE
-	depends on ADK_BROKEN
-	help
-	  Acme Systems Foxboard FOXG20
-
diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i
deleted file mode 100644
index d3edb99c6..000000000
--- a/target/arm/sys-available/cubox-i
+++ /dev/null
@@ -1,26 +0,0 @@
-config ADK_TARGET_SYSTEM_CUBOX_I
-	bool "Cubox-i"
-	select ADK_arm
-	select ADK_little
-	select ADK_eabihf
-	select ADK_fpu_neon
-	select ADK_cubox_i
-	select ADK_CPU_CORTEX_A9
-	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_CPU_FREQ
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_SD
-	select ADK_TARGET_WITH_I2C
-	select ADK_TARGET_WITH_SPI
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_SDIO
-	select ADK_TARGET_WITH_SOUND
-	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_SMP
-	select ADK_TARGET_KERNEL_ZIMAGE
-	select ADK_TARGET_WITH_ROOT_RW
-	select ADK_PACKAGE_U_BOOT_IMX6
-	help
-	  Solidrun Cubox-i
-
diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000
deleted file mode 100644
index c63e73ef7..000000000
--- a/target/arm/sys-available/keyasic-ka2000
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_TARGET_SYSTEM_KEYASIC_KA2000
-	bool "KeyASIC KA2000 (f.e. Transcend WifiSD)"
-	select ADK_arm
-	select ADK_little
-	select ADK_soft_float
-	select ADK_eabi
-	select ADK_keyasic_ka2000
-	select ADK_CPU_ARM926EJ_S
-	select ADK_TOOLCHAIN
-	select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
-	select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
-	depends on ADK_BROKEN
-	help
-	  KeyASIC KA2000 aka Transcend WifiSD.
-	  Build a toolchain only and make all binaries static.
-
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/sys-available/qemu-arm
deleted file mode 100644
index 848179629..000000000
--- a/target/arm/sys-available/qemu-arm
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_ARM
-	bool "Qemu Emulator"
-	select ADK_arm
-	select ADK_qemu_arm
-	select ADK_little
-	select ADK_eabi
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	  Qemu Emulator for arm architecture.
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/sys-available/raspberry-pi
deleted file mode 100644
index 45fd531d3..000000000
--- a/target/arm/sys-available/raspberry-pi
+++ /dev/null
@@ -1,20 +0,0 @@
-config ADK_TARGET_SYSTEM_RASPBERRY_PI
-	bool "Raspberry PI"
-	select ADK_arm
-	select ADK_little
-	select ADK_eabihf
-	select ADK_fpu_vfp
-	select ADK_raspberry_pi
-	select ADK_CPU_ARM1176JZF_S
-	select ADK_TARGET_CPU_WITH_FPU
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_CPU_FREQ
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_SD
-	select ADK_PACKAGE_BCM2835_BOOTLOADER
-	select ADK_TARGET_WITH_ROOT_RW
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	  Raspberry PI
-
diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/sys-available/sharp-zaurus
deleted file mode 100644
index 563866960..000000000
--- a/target/arm/sys-available/sharp-zaurus
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_TARGET_SYSTEM_SHARP_ZAURUS
-	bool "Sharp Zaurus CL3200 (Terrier)"
-	select ADK_arm
-	select ADK_sharp_zaurus
-	select ADK_little
-	select ADK_eabi
-	select ADK_CPU_XSCALE
-	select ADK_TARGET_CPU_WITH_IWMMXT
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_PCMCIA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_SOUND
-	select ADK_TARGET_WITH_TOUCHSCREEN
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	 Support for Sharp Zaurus CL3200 (Terrier)
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/sys-available/toolchain-arm
deleted file mode 100644
index a98f9c225..000000000
--- a/target/arm/sys-available/toolchain-arm
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
-	bool "Toolchain only"
-	select ADK_arm
-	select ADK_toolchain_arm
-	select ADK_little
-	select ADK_eabi
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  ARM toolchain.
diff --git a/target/arm/systems/cubox-i b/target/arm/systems/cubox-i
new file mode 100644
index 000000000..d3edb99c6
--- /dev/null
+++ b/target/arm/systems/cubox-i
@@ -0,0 +1,26 @@
+config ADK_TARGET_SYSTEM_CUBOX_I
+	bool "Cubox-i"
+	select ADK_arm
+	select ADK_little
+	select ADK_eabihf
+	select ADK_fpu_neon
+	select ADK_cubox_i
+	select ADK_CPU_CORTEX_A9
+	select ADK_TARGET_CPU_WITH_FPU
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_CPU_FREQ
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_SD
+	select ADK_TARGET_WITH_I2C
+	select ADK_TARGET_WITH_SPI
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_SDIO
+	select ADK_TARGET_WITH_SOUND
+	select ADK_TARGET_WITH_LEDS
+	select ADK_TARGET_WITH_SMP
+	select ADK_TARGET_KERNEL_ZIMAGE
+	select ADK_TARGET_WITH_ROOT_RW
+	select ADK_PACKAGE_U_BOOT_IMX6
+	help
+	  Solidrun Cubox-i
+
diff --git a/target/arm/systems/keyasic-ka2000 b/target/arm/systems/keyasic-ka2000
new file mode 100644
index 000000000..c63e73ef7
--- /dev/null
+++ b/target/arm/systems/keyasic-ka2000
@@ -0,0 +1,16 @@
+config ADK_TARGET_SYSTEM_KEYASIC_KA2000
+	bool "KeyASIC KA2000 (f.e. Transcend WifiSD)"
+	select ADK_arm
+	select ADK_little
+	select ADK_soft_float
+	select ADK_eabi
+	select ADK_keyasic_ka2000
+	select ADK_CPU_ARM926EJ_S
+	select ADK_TOOLCHAIN
+	select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
+	select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
+	depends on ADK_BROKEN
+	help
+	  KeyASIC KA2000 aka Transcend WifiSD.
+	  Build a toolchain only and make all binaries static.
+
diff --git a/target/arm/systems/qemu-arm b/target/arm/systems/qemu-arm
new file mode 100644
index 000000000..196ae6e75
--- /dev/null
+++ b/target/arm/systems/qemu-arm
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_QEMU_ARM
+	bool "Qemu Emulator"
+	select ADK_arm
+	select ADK_qemu_arm
+	select ADK_little
+	select ADK_eabi
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Qemu Emulator for ARM architecture.
+
diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi
new file mode 100644
index 000000000..45fd531d3
--- /dev/null
+++ b/target/arm/systems/raspberry-pi
@@ -0,0 +1,20 @@
+config ADK_TARGET_SYSTEM_RASPBERRY_PI
+	bool "Raspberry PI"
+	select ADK_arm
+	select ADK_little
+	select ADK_eabihf
+	select ADK_fpu_vfp
+	select ADK_raspberry_pi
+	select ADK_CPU_ARM1176JZF_S
+	select ADK_TARGET_CPU_WITH_FPU
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_CPU_FREQ
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_SD
+	select ADK_PACKAGE_BCM2835_BOOTLOADER
+	select ADK_TARGET_WITH_ROOT_RW
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	  Raspberry PI
+
diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus
new file mode 100644
index 000000000..195ed9c0e
--- /dev/null
+++ b/target/arm/systems/sharp-zaurus
@@ -0,0 +1,17 @@
+config ADK_TARGET_SYSTEM_SHARP_ZAURUS
+	bool "Sharp Zaurus CL3200 (Terrier)"
+	select ADK_arm
+	select ADK_sharp_zaurus
+	select ADK_little
+	select ADK_eabi
+	select ADK_CPU_XSCALE
+	select ADK_TARGET_CPU_WITH_IWMMXT
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_PCMCIA
+	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_SOUND
+	select ADK_TARGET_WITH_TOUCHSCREEN
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Sharp Zaurus CL3200 (Terrier)
+
diff --git a/target/arm/systems/toolchain-arm b/target/arm/systems/toolchain-arm
new file mode 100644
index 000000000..a98f9c225
--- /dev/null
+++ b/target/arm/systems/toolchain-arm
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_ARM
+	bool "Toolchain only"
+	select ADK_arm
+	select ADK_toolchain_arm
+	select ADK_little
+	select ADK_eabi
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  ARM toolchain.
diff --git a/target/collections/console b/target/collections/console
new file mode 100644
index 000000000..566ba8aac
--- /dev/null
+++ b/target/collections/console
@@ -0,0 +1,33 @@
+config ADK_PKG_CONSOLE
+	boolean "Choose packages for a desktop system without X"
+	default n
+	select ADK_PACKAGE_ALSA_UTILS
+	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
+	select ADK_PACKAGE_SCREEN
+	select ADK_PACKAGE_SUDO
+	select ADK_PACKAGE_LINKS
+	select ADK_PACKAGE_ELINKS
+	select ADK_PACKAGE_LYNX
+	select ADK_PACKAGE_KEYCHAIN
+	select ADK_PACKAGE_OPENSSH
+	select ADK_PACKAGE_OPENSSH_CLIENT
+	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
+	select ADK_PACKAGE_OPENSSH_SERVER
+	select ADK_PACKAGE_MUTT
+	select ADK_PACKAGE_IRSSI
+	select ADK_PACKAGE_IRSSI_WITH_SSL
+	select ADK_PACKAGE_IRSSI_WITH_IPV6
+	select ADK_PACKAGE_MPG123
+	select ADK_PACKAGE_MPLAYER
+	select ADK_PACKAGE_MPC
+	select ADK_PACKAGE_RTORRENT
+	select ADK_PACKAGE_WPA_SUPPLICANT
+	select ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL
+	select ADK_PACKAGE_TCPDUMP
+	select ADK_PACKAGE_VIM
+	select ADK_PACKAGE_WIRELESS_TOOLS if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	select ADK_PACKAGE_IW if ADK_TARGET_SYSTEM_IBM_X40
+	select ADK_KERNEL_USB_STORAGE
+	help
+	  Support for Linux system without X.
+
diff --git a/target/collections/development b/target/collections/development
new file mode 100644
index 000000000..62404159f
--- /dev/null
+++ b/target/collections/development
@@ -0,0 +1,40 @@
+config ADK_PKG_DEVELOPMENT
+	bool "Compile a ADK development system"
+	default n
+	select ADK_PACKAGE_BASH
+	select ADK_PACKAGE_BINUTILS
+	select ADK_PACKAGE_DIFFUTILS
+	select ADK_PACKAGE_GCC
+	select ADK_PACKAGE_GXX
+	select ADK_PACKAGE_GIT
+	select ADK_PACKAGE_GREP
+	select ADK_PACKAGE_TAR
+	select ADK_PACKAGE_MUSL_DEV if ADK_TARGET_LIB_MUSL
+	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
+	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
+	select ADK_PACKAGE_LIBNCURSES
+	select ADK_PACKAGE_LIBNCURSES_DEV
+	select ADK_PACKAGE_MAKE
+	select ADK_PACKAGE_MKFONTDIR
+	select ADK_PACKAGE_PERL
+	select BUSYBOX_STAT
+	select BUSYBOX_FEATURE_STAT_FORMAT
+	select BUSYBOX_FEATURE_DD_IBS_OBS
+	select BUSYBOX_TR
+	select BUSYBOX_FEATURE_TR_CLASSES
+	select ADK_PACKAGE_ZLIB
+	select ADK_PACKAGE_ZLIB_DEV
+	select ADK_PACKAGE_WGET
+	select ADK_PACKAGE_WGET_WITH_OPENSSL
+	select ADK_PACKAGE_STRACE
+	select ADK_PACKAGE_GDB
+	select ADK_PACKAGE_PARTED
+	select ADK_PACKAGE_SFDISK
+	select ADK_PACKAGE_MKE2FS
+	select ADK_PACKAGE_DOSFSTOOLS
+	help
+	  After bootstrapping a Linux system you might want to
+	  switch to native builds with your target. 
+	  If you choose this option, all software required
+	  for native building will be selected by this option.
+
diff --git a/target/collections/mpdbox b/target/collections/mpdbox
new file mode 100644
index 000000000..46a6d4bb2
--- /dev/null
+++ b/target/collections/mpdbox
@@ -0,0 +1,57 @@
+config ADK_PKG_MPDBOX
+	bool "Choose packages for MPDBox system"
+	default n
+	select ADK_PACKAGE_MPDBOX
+	select BUSYBOX_NTPD
+	select ADK_PACKAGE_CIFS_UTILS
+	select ADK_PACKAGE_NFS_UTILS
+	select ADK_PACKAGE_NFS_UTILS_CLIENT
+	select ADK_PACKAGE_LIBMPDCLIENT
+	select ADK_PACKAGE_MPC
+	select ADK_PACKAGE_MPD
+	select ADK_PACKAGE_MPD_WITH_ALSA
+	select ADK_PACKAGE_MPD_WITH_PULSE
+	select ADK_PACKAGE_MPD_WITH_MP3
+	select ADK_PACKAGE_MPD_WITH_MP4
+	select ADK_PACKAGE_MPD_WITH_OGG
+	select ADK_PACKAGE_MPD_WITH_OPUS
+	select ADK_PACKAGE_MPD_WITH_FLAC
+	select ADK_PACKAGE_MPD_WITH_WAV
+	select ADK_PACKAGE_MPD_WITH_MMS
+	select ADK_PACKAGE_MPD_WITH_FFMPEG
+	select ADK_PACKAGE_MPD_WITH_SHOUT
+	select ADK_PACKAGE_MPD_WITH_CURL
+	select ADK_PACKAGE_MPD_WITH_SAMPLERATE
+	select ADK_PACKAGE_MPD_WITH_HTTPD
+	select ADK_PACKAGE_FILE
+	select ADK_PACKAGE_HTOP
+	select ADK_PACKAGE_DROPBEAR
+	select ADK_PACKAGE_DROPBEAR_WITH_UTMP
+	select ADK_PACKAGE_FFMPEG
+	select ADK_PACKAGE_FFPROBE
+	select ADK_PACKAGE_LIBFFMPEG
+	select ADK_PACKAGE_LIBFFMPEG_WITH_X264
+	select ADK_PACKAGE_LIBFFMPEG_WITH_AAC
+	select ADK_PACKAGE_LIBFFMPEG_WITH_MP3
+	select ADK_PACKAGE_LIBFFMPEG_WITH_VP8
+	select ADK_PACKAGE_LIBFFMPEG_WITH_THEORA
+	select ADK_PACKAGE_LIBFFMPEG_WITH_XVID
+	select ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS
+	select ADK_PACKAGE_LIGHTTPD
+	select ADK_PACKAGE_LIGHTTPD_WITH_IPV6
+	select ADK_PACKAGE_LIGHTTPD_WITH_SSL
+	select ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI
+	select ADK_PACKAGE_LIGHTTPD_MOD_DIRLISTING
+	select ADK_PACKAGE_LIGHTTPD_MOD_AUTH
+	select ADK_PACKAGE_PHP
+	select ADK_PACKAGE_PHP_MOD_SESSION
+	select ADK_PACKAGE_PHP_MOD_JSON
+	select ADK_PACKAGE_PHP_FASTCGI
+	select ADK_PACKAGE_SCREEN
+	select ADK_PACKAGE_VIM
+	select ADK_PACKAGE_E2FSCK
+	select ADK_PACKAGE_ALSA_UTILS
+	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
+	help
+	  Create a small mpdbox.
+
diff --git a/target/collections/test b/target/collections/test
new file mode 100644
index 000000000..0ff042eef
--- /dev/null
+++ b/target/collections/test
@@ -0,0 +1,20 @@
+config ADK_PKG_TEST
+	bool "Compile a ADK test framework system"
+	select ADK_PACKAGE_ADK_TEST_TOOLS
+	select ADK_PACKAGE_STRACE
+	select ADK_PACKAGE_SOCAT
+	select ADK_PACKAGE_MAKE
+	select ADK_PACKAGE_FILE
+	select ADK_PACKAGE_RDATE
+	select ADK_SIMPLE_NETWORK_CONFIG
+	select ADK_TARGET_PACKAGE_TXZ
+	select ADK_RUNTIME_START_ADK_TEST_TOOLS
+	select ADK_KERNEL_BLK_DEV_INITRD
+	select ADK_KERNEL_COMP_XZ
+	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
+	select ADK_KERNEL_IPV6
+	default n
+	help
+	  Package collection used to build adk-test-framework root
+	  filesystem.
+
diff --git a/target/collections/xorg b/target/collections/xorg
new file mode 100644
index 000000000..75ee6bb18
--- /dev/null
+++ b/target/collections/xorg
@@ -0,0 +1,27 @@
+config ADK_PKG_XORG
+	bool "Choose packages for graphical desktop system with Xorg"
+	default n
+	select ADK_PKG_CONSOLE
+	select ADK_PACKAGE_RXVT_UNICODE
+	select ADK_PACKAGE_FIREFOX
+	select ADK_PACKAGE_XTERM
+	select ADK_PACKAGE_XORG_SERVER
+	select ADK_PACKAGE_XORG_SERVER_WITH_DRI
+	select ADK_PACKAGE_XF86_INPUT_KEYBOARD
+	select ADK_PACKAGE_XF86_INPUT_MOUSE
+	select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_IBM_X40
+	select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_I686
+	select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_X86_64
+	select ADK_PACKAGE_FONT_MISC_MISC
+	select ADK_PACKAGE_SETXKBMAP
+	select ADK_PACKAGE_XBINDKEYS
+	select ADK_PACKAGE_DISPLAY
+	select ADK_PACKAGE_FEH
+	select ADK_PACKAGE_XINIT
+	select ADK_PACKAGE_EVILWM
+	select ADK_PACKAGE_DILLO
+	select ADK_PACKAGE_XRDB
+	help
+	  X desktop environment with EvilWM.
+
diff --git a/target/config/Config.in.arch b/target/config/Config.in.arch
new file mode 100644
index 000000000..83a4c07c7
--- /dev/null
+++ b/target/config/Config.in.arch
@@ -0,0 +1,2 @@
+source "target/config/Config.in.arch.default"
+source "target/config/Config.in.arch.choice"
diff --git a/target/config/Config.in.system b/target/config/Config.in.system
new file mode 100644
index 000000000..670fcc4a3
--- /dev/null
+++ b/target/config/Config.in.system
@@ -0,0 +1,2 @@
+source "target/config/Config.in.system.default"
+source "target/config/Config.in.system.choice"
diff --git a/target/m68k/sys-available/aranym-m68k b/target/m68k/sys-available/aranym-m68k
deleted file mode 100644
index 29e8810a5..000000000
--- a/target/m68k/sys-available/aranym-m68k
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_TARGET_SYSTEM_ARANYM_M68K
-	bool "ARAnyM Emulator"
-	select ADK_m68k
-	select ADK_aranym_m68k
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_HDD
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	 Support for ARAnyM Emulator (M68K).
-
diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/sys-available/toolchain-m68k
deleted file mode 100644
index f7218cdbd..000000000
--- a/target/m68k/sys-available/toolchain-m68k
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K
-	bool "Toolchain only"
-	select ADK_m68k
-	select ADK_toolchain_m68k
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  Build a m68k toolchain.
-
diff --git a/target/m68k/systems/aranym-m68k b/target/m68k/systems/aranym-m68k
new file mode 100644
index 000000000..29e8810a5
--- /dev/null
+++ b/target/m68k/systems/aranym-m68k
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_ARANYM_M68K
+	bool "ARAnyM Emulator"
+	select ADK_m68k
+	select ADK_aranym_m68k
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for ARAnyM Emulator (M68K).
+
diff --git a/target/m68k/systems/toolchain-m68k b/target/m68k/systems/toolchain-m68k
new file mode 100644
index 000000000..12249bd97
--- /dev/null
+++ b/target/m68k/systems/toolchain-m68k
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K
+	bool "Toolchain only"
+	select ADK_m68k
+	select ADK_toolchain_m68k
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  M68K toolchain.
+
diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/sys-available/qemu-microblaze
deleted file mode 100644
index ac4a36e9d..000000000
--- a/target/microblaze/sys-available/qemu-microblaze
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
-	bool "Qemu Emulator"
-	select ADK_microblaze
-	select ADK_qemu_microblaze
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_LINUXBIN
-	help
-	 Qemu support for MICROBLAZE architecture.
-
diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/sys-available/toolchain-microblaze
deleted file mode 100644
index e01ed69a0..000000000
--- a/target/microblaze/sys-available/toolchain-microblaze
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE
-	bool "Toolchain only"
-	select ADK_microblaze
-	select ADK_toolchain_microblaze
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MICROBLAZE toolchain.
-
diff --git a/target/microblaze/systems/qemu-microblaze b/target/microblaze/systems/qemu-microblaze
new file mode 100644
index 000000000..ac4a36e9d
--- /dev/null
+++ b/target/microblaze/systems/qemu-microblaze
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_MICROBLAZE
+	bool "Qemu Emulator"
+	select ADK_microblaze
+	select ADK_qemu_microblaze
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_LINUXBIN
+	help
+	 Qemu support for MICROBLAZE architecture.
+
diff --git a/target/microblaze/systems/toolchain-microblaze b/target/microblaze/systems/toolchain-microblaze
new file mode 100644
index 000000000..e01ed69a0
--- /dev/null
+++ b/target/microblaze/systems/toolchain-microblaze
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MICROBLAZE
+	bool "Toolchain only"
+	select ADK_microblaze
+	select ADK_toolchain_microblaze
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  MICROBLAZE toolchain.
+
diff --git a/target/mips/sys-available/broadcom-bcm47xx b/target/mips/sys-available/broadcom-bcm47xx
deleted file mode 100644
index 77bb28c63..000000000
--- a/target/mips/sys-available/broadcom-bcm47xx
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_BROADCOM_BCM47XX
-	bool "Broadcom BCM47XX"
-	select ADK_mips
-	select ADK_little
-	select ADK_broadcom_bcm47xx
-	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_WITH_SSB
-	select ADK_TARGET_WITH_WATCHDOG
-	depends on ADK_BROKEN
-	help
-	  Broadcom BCM47xx systems.
-
diff --git a/target/mips/sys-available/fon-fon2100 b/target/mips/sys-available/fon-fon2100
deleted file mode 100644
index e1e0990b4..000000000
--- a/target/mips/sys-available/fon-fon2100
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_FON_FON2100
-	bool "FON's FON2100"
-	select ADK_mips
-	select ADK_big
-	select ADK_fon_fon2100
-	select ADK_TARGET_WITH_MTD
-	select ADK_TARGET_WITH_AHB
-	select ADK_TARGET_KERNEL_VMLINUZ
-	depends on ADK_BROKEN
-	help
-	  Support for FON's FON2100.
-
diff --git a/target/mips/sys-available/linksys-ag241 b/target/mips/sys-available/linksys-ag241
deleted file mode 100644
index a7465d951..000000000
--- a/target/mips/sys-available/linksys-ag241
+++ /dev/null
@@ -1,16 +0,0 @@
-config ADK_TARGET_SYSTEM_LINKSYS_AG241
-	bool "Linksys AG241"
-	select ADK_mips
-	select ADK_little
-	select ADK_linksys_ag241
-	select ADK_TARGET_WITH_DSL
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_MTD
-	select ADK_KPACKAGE_KMOD_ATM_BR2684
-	select ADK_PACKAGE_KMOD_SANGAM_ATM
-	select ADK_PACKAGE_BR2684CTL
-	depends on ADK_BROKEN
-	help
-	  Linksys AG241 DSL router.
-	  (Texas Instruments AR7 platform)
-
diff --git a/target/mips/sys-available/mikrotik-rb4xx b/target/mips/sys-available/mikrotik-rb4xx
deleted file mode 100644
index 0d68df59a..000000000
--- a/target/mips/sys-available/mikrotik-rb4xx
+++ /dev/null
@@ -1,12 +0,0 @@
-config ADK_TARGET_SYSTEM_MIKROTIK_RB4XX
-	bool "Mikrotik Routerboard 4xx"
-	select ADK_mips
-	select ADK_big
-	select ADK_mikrotik_rb4xx
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_NAND
-	depends on ADK_BROKEN
-	help
-	  Support for Mikrotik RB411/RB433.
-
diff --git a/target/mips/sys-available/mikrotik-rb532 b/target/mips/sys-available/mikrotik-rb532
deleted file mode 100644
index 505abf651..000000000
--- a/target/mips/sys-available/mikrotik-rb532
+++ /dev/null
@@ -1,14 +0,0 @@
-config ADK_TARGET_SYSTEM_MIKROTIK_RB532
-	bool "Mikrotik Routerboard 532"
-	select ADK_mips
-	select ADK_little
-	select ADK_mikrotik_rb532
-	select ADK_CPU_MIPS32
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_NAND
-	select ADK_TARGET_WITH_PATA
-	select ADK_TARGET_WITH_LEDS
-	help
-	  Support for Mikrotik RB532.
-
diff --git a/target/mips/sys-available/qemu-mips b/target/mips/sys-available/qemu-mips
deleted file mode 100644
index 2dfc09ca6..000000000
--- a/target/mips/sys-available/qemu-mips
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS
-	bool "Qemu Emulator"
-	select ADK_mips
-	select ADK_qemu_mips
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	 Qemu support for MIPS architecture.
-
diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/sys-available/toolchain-mips
deleted file mode 100644
index 035908220..000000000
--- a/target/mips/sys-available/toolchain-mips
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
-	bool "Toolchain only"
-	select ADK_mips
-	select ADK_toolchain_mips
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS toolchain.
-
diff --git a/target/mips/systems/mikrotik-rb532 b/target/mips/systems/mikrotik-rb532
new file mode 100644
index 000000000..505abf651
--- /dev/null
+++ b/target/mips/systems/mikrotik-rb532
@@ -0,0 +1,14 @@
+config ADK_TARGET_SYSTEM_MIKROTIK_RB532
+	bool "Mikrotik Routerboard 532"
+	select ADK_mips
+	select ADK_little
+	select ADK_mikrotik_rb532
+	select ADK_CPU_MIPS32
+	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_WATCHDOG
+	select ADK_TARGET_WITH_NAND
+	select ADK_TARGET_WITH_PATA
+	select ADK_TARGET_WITH_LEDS
+	help
+	  Support for Mikrotik RB532.
+
diff --git a/target/mips/systems/qemu-mips b/target/mips/systems/qemu-mips
new file mode 100644
index 000000000..2dfc09ca6
--- /dev/null
+++ b/target/mips/systems/qemu-mips
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_MIPS
+	bool "Qemu Emulator"
+	select ADK_mips
+	select ADK_qemu_mips
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_VMLINUZ
+	help
+	 Qemu support for MIPS architecture.
+
diff --git a/target/mips/systems/toolchain-mips b/target/mips/systems/toolchain-mips
new file mode 100644
index 000000000..035908220
--- /dev/null
+++ b/target/mips/systems/toolchain-mips
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS
+	bool "Toolchain only"
+	select ADK_mips
+	select ADK_toolchain_mips
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  MIPS toolchain.
+
diff --git a/target/mips64/sys-available/lemote-yeelong b/target/mips64/sys-available/lemote-yeelong
deleted file mode 100644
index 65f400048..000000000
--- a/target/mips64/sys-available/lemote-yeelong
+++ /dev/null
@@ -1,19 +0,0 @@
-config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	bool "Lemote Yeelong laptop"
-	select ADK_mips64
-	select ADK_little
-	select ADK_lemote_yeelong
-	select ADK_LINUX_64
-	select ADK_CPU_LOONGSON2F
-	select ADK_TARGET_WITH_USB_BOOT
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_HDD
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_ROOT_RW
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-         System profile for Lemote Yeelong laptop.
-
diff --git a/target/mips64/sys-available/qemu-mips64 b/target/mips64/sys-available/qemu-mips64
deleted file mode 100644
index f8846f472..000000000
--- a/target/mips64/sys-available/qemu-mips64
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_MIPS64
-	bool "Qemu Emulator"
-	select ADK_mips64
-	select ADK_qemu_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_VMLINUZ
-	help
-	 Qemu support for MIPS64 architecture.
-
diff --git a/target/mips64/sys-available/toolchain-mips64 b/target/mips64/sys-available/toolchain-mips64
deleted file mode 100644
index 909de4aad..000000000
--- a/target/mips64/sys-available/toolchain-mips64
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
-	bool "Toolchain only"
-	select ADK_mips64
-	select ADK_toolchain_mips64
-	select ADK_CPU_MIPS64
-	select ADK_LINUX_64
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  MIPS64 toolchain.
-
diff --git a/target/mips64/systems/lemote-yeelong b/target/mips64/systems/lemote-yeelong
new file mode 100644
index 000000000..65f400048
--- /dev/null
+++ b/target/mips64/systems/lemote-yeelong
@@ -0,0 +1,19 @@
+config ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+	bool "Lemote Yeelong laptop"
+	select ADK_mips64
+	select ADK_little
+	select ADK_lemote_yeelong
+	select ADK_LINUX_64
+	select ADK_CPU_LOONGSON2F
+	select ADK_TARGET_WITH_USB_BOOT
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_ROOT_RW
+	select ADK_TARGET_KERNEL_VMLINUZ
+	help
+         System profile for Lemote Yeelong laptop.
+
diff --git a/target/mips64/systems/qemu-mips64 b/target/mips64/systems/qemu-mips64
new file mode 100644
index 000000000..f8846f472
--- /dev/null
+++ b/target/mips64/systems/qemu-mips64
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_QEMU_MIPS64
+	bool "Qemu Emulator"
+	select ADK_mips64
+	select ADK_qemu_mips64
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_VMLINUZ
+	help
+	 Qemu support for MIPS64 architecture.
+
diff --git a/target/mips64/systems/toolchain-mips64 b/target/mips64/systems/toolchain-mips64
new file mode 100644
index 000000000..909de4aad
--- /dev/null
+++ b/target/mips64/systems/toolchain-mips64
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_MIPS64
+	bool "Toolchain only"
+	select ADK_mips64
+	select ADK_toolchain_mips64
+	select ADK_CPU_MIPS64
+	select ADK_LINUX_64
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  MIPS64 toolchain.
+
diff --git a/target/packages/pkg-available/console b/target/packages/pkg-available/console
deleted file mode 100644
index 566ba8aac..000000000
--- a/target/packages/pkg-available/console
+++ /dev/null
@@ -1,33 +0,0 @@
-config ADK_PKG_CONSOLE
-	boolean "Choose packages for a desktop system without X"
-	default n
-	select ADK_PACKAGE_ALSA_UTILS
-	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
-	select ADK_PACKAGE_SCREEN
-	select ADK_PACKAGE_SUDO
-	select ADK_PACKAGE_LINKS
-	select ADK_PACKAGE_ELINKS
-	select ADK_PACKAGE_LYNX
-	select ADK_PACKAGE_KEYCHAIN
-	select ADK_PACKAGE_OPENSSH
-	select ADK_PACKAGE_OPENSSH_CLIENT
-	select ADK_PACKAGE_OPENSSH_CLIENT_UTILS
-	select ADK_PACKAGE_OPENSSH_SERVER
-	select ADK_PACKAGE_MUTT
-	select ADK_PACKAGE_IRSSI
-	select ADK_PACKAGE_IRSSI_WITH_SSL
-	select ADK_PACKAGE_IRSSI_WITH_IPV6
-	select ADK_PACKAGE_MPG123
-	select ADK_PACKAGE_MPLAYER
-	select ADK_PACKAGE_MPC
-	select ADK_PACKAGE_RTORRENT
-	select ADK_PACKAGE_WPA_SUPPLICANT
-	select ADK_PACKAGE_WPA_SUPPLICANT_WITH_OPENSSL
-	select ADK_PACKAGE_TCPDUMP
-	select ADK_PACKAGE_VIM
-	select ADK_PACKAGE_WIRELESS_TOOLS if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	select ADK_PACKAGE_IW if ADK_TARGET_SYSTEM_IBM_X40
-	select ADK_KERNEL_USB_STORAGE
-	help
-	  Support for Linux system without X.
-
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
deleted file mode 100644
index 62404159f..000000000
--- a/target/packages/pkg-available/development
+++ /dev/null
@@ -1,40 +0,0 @@
-config ADK_PKG_DEVELOPMENT
-	bool "Compile a ADK development system"
-	default n
-	select ADK_PACKAGE_BASH
-	select ADK_PACKAGE_BINUTILS
-	select ADK_PACKAGE_DIFFUTILS
-	select ADK_PACKAGE_GCC
-	select ADK_PACKAGE_GXX
-	select ADK_PACKAGE_GIT
-	select ADK_PACKAGE_GREP
-	select ADK_PACKAGE_TAR
-	select ADK_PACKAGE_MUSL_DEV if ADK_TARGET_LIB_MUSL
-	select ADK_PACKAGE_UCLIBC_DEV if ADK_TARGET_LIB_UCLIBC
-	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
-	select ADK_PACKAGE_LIBNCURSES
-	select ADK_PACKAGE_LIBNCURSES_DEV
-	select ADK_PACKAGE_MAKE
-	select ADK_PACKAGE_MKFONTDIR
-	select ADK_PACKAGE_PERL
-	select BUSYBOX_STAT
-	select BUSYBOX_FEATURE_STAT_FORMAT
-	select BUSYBOX_FEATURE_DD_IBS_OBS
-	select BUSYBOX_TR
-	select BUSYBOX_FEATURE_TR_CLASSES
-	select ADK_PACKAGE_ZLIB
-	select ADK_PACKAGE_ZLIB_DEV
-	select ADK_PACKAGE_WGET
-	select ADK_PACKAGE_WGET_WITH_OPENSSL
-	select ADK_PACKAGE_STRACE
-	select ADK_PACKAGE_GDB
-	select ADK_PACKAGE_PARTED
-	select ADK_PACKAGE_SFDISK
-	select ADK_PACKAGE_MKE2FS
-	select ADK_PACKAGE_DOSFSTOOLS
-	help
-	  After bootstrapping a Linux system you might want to
-	  switch to native builds with your target. 
-	  If you choose this option, all software required
-	  for native building will be selected by this option.
-
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
deleted file mode 100644
index 46a6d4bb2..000000000
--- a/target/packages/pkg-available/mpdbox
+++ /dev/null
@@ -1,57 +0,0 @@
-config ADK_PKG_MPDBOX
-	bool "Choose packages for MPDBox system"
-	default n
-	select ADK_PACKAGE_MPDBOX
-	select BUSYBOX_NTPD
-	select ADK_PACKAGE_CIFS_UTILS
-	select ADK_PACKAGE_NFS_UTILS
-	select ADK_PACKAGE_NFS_UTILS_CLIENT
-	select ADK_PACKAGE_LIBMPDCLIENT
-	select ADK_PACKAGE_MPC
-	select ADK_PACKAGE_MPD
-	select ADK_PACKAGE_MPD_WITH_ALSA
-	select ADK_PACKAGE_MPD_WITH_PULSE
-	select ADK_PACKAGE_MPD_WITH_MP3
-	select ADK_PACKAGE_MPD_WITH_MP4
-	select ADK_PACKAGE_MPD_WITH_OGG
-	select ADK_PACKAGE_MPD_WITH_OPUS
-	select ADK_PACKAGE_MPD_WITH_FLAC
-	select ADK_PACKAGE_MPD_WITH_WAV
-	select ADK_PACKAGE_MPD_WITH_MMS
-	select ADK_PACKAGE_MPD_WITH_FFMPEG
-	select ADK_PACKAGE_MPD_WITH_SHOUT
-	select ADK_PACKAGE_MPD_WITH_CURL
-	select ADK_PACKAGE_MPD_WITH_SAMPLERATE
-	select ADK_PACKAGE_MPD_WITH_HTTPD
-	select ADK_PACKAGE_FILE
-	select ADK_PACKAGE_HTOP
-	select ADK_PACKAGE_DROPBEAR
-	select ADK_PACKAGE_DROPBEAR_WITH_UTMP
-	select ADK_PACKAGE_FFMPEG
-	select ADK_PACKAGE_FFPROBE
-	select ADK_PACKAGE_LIBFFMPEG
-	select ADK_PACKAGE_LIBFFMPEG_WITH_X264
-	select ADK_PACKAGE_LIBFFMPEG_WITH_AAC
-	select ADK_PACKAGE_LIBFFMPEG_WITH_MP3
-	select ADK_PACKAGE_LIBFFMPEG_WITH_VP8
-	select ADK_PACKAGE_LIBFFMPEG_WITH_THEORA
-	select ADK_PACKAGE_LIBFFMPEG_WITH_XVID
-	select ADK_PACKAGE_LIBFFMPEG_WITH_VORBIS
-	select ADK_PACKAGE_LIGHTTPD
-	select ADK_PACKAGE_LIGHTTPD_WITH_IPV6
-	select ADK_PACKAGE_LIGHTTPD_WITH_SSL
-	select ADK_PACKAGE_LIGHTTPD_MOD_FASTCGI
-	select ADK_PACKAGE_LIGHTTPD_MOD_DIRLISTING
-	select ADK_PACKAGE_LIGHTTPD_MOD_AUTH
-	select ADK_PACKAGE_PHP
-	select ADK_PACKAGE_PHP_MOD_SESSION
-	select ADK_PACKAGE_PHP_MOD_JSON
-	select ADK_PACKAGE_PHP_FASTCGI
-	select ADK_PACKAGE_SCREEN
-	select ADK_PACKAGE_VIM
-	select ADK_PACKAGE_E2FSCK
-	select ADK_PACKAGE_ALSA_UTILS
-	select ADK_PACKAGE_ALSA_UTILS_WITH_ALSAMIXER
-	help
-	  Create a small mpdbox.
-
diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test
deleted file mode 100644
index 0ff042eef..000000000
--- a/target/packages/pkg-available/test
+++ /dev/null
@@ -1,20 +0,0 @@
-config ADK_PKG_TEST
-	bool "Compile a ADK test framework system"
-	select ADK_PACKAGE_ADK_TEST_TOOLS
-	select ADK_PACKAGE_STRACE
-	select ADK_PACKAGE_SOCAT
-	select ADK_PACKAGE_MAKE
-	select ADK_PACKAGE_FILE
-	select ADK_PACKAGE_RDATE
-	select ADK_SIMPLE_NETWORK_CONFIG
-	select ADK_TARGET_PACKAGE_TXZ
-	select ADK_RUNTIME_START_ADK_TEST_TOOLS
-	select ADK_KERNEL_BLK_DEV_INITRD
-	select ADK_KERNEL_COMP_XZ
-	select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ
-	select ADK_KERNEL_IPV6
-	default n
-	help
-	  Package collection used to build adk-test-framework root
-	  filesystem.
-
diff --git a/target/packages/pkg-available/xorg b/target/packages/pkg-available/xorg
deleted file mode 100644
index 75ee6bb18..000000000
--- a/target/packages/pkg-available/xorg
+++ /dev/null
@@ -1,27 +0,0 @@
-config ADK_PKG_XORG
-	bool "Choose packages for graphical desktop system with Xorg"
-	default n
-	select ADK_PKG_CONSOLE
-	select ADK_PACKAGE_RXVT_UNICODE
-	select ADK_PACKAGE_FIREFOX
-	select ADK_PACKAGE_XTERM
-	select ADK_PACKAGE_XORG_SERVER
-	select ADK_PACKAGE_XORG_SERVER_WITH_DRI
-	select ADK_PACKAGE_XF86_INPUT_KEYBOARD
-	select ADK_PACKAGE_XF86_INPUT_MOUSE
-	select ADK_PACKAGE_XF86_VIDEO_INTEL if ADK_TARGET_SYSTEM_IBM_X40
-	select ADK_PACKAGE_XF86_VIDEO_SILICONMOTION if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
-	select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_I686
-	select ADK_PACKAGE_XF86_VIDEO_CIRRUS if ADK_TARGET_SYSTEM_QEMU_X86_64
-	select ADK_PACKAGE_FONT_MISC_MISC
-	select ADK_PACKAGE_SETXKBMAP
-	select ADK_PACKAGE_XBINDKEYS
-	select ADK_PACKAGE_DISPLAY
-	select ADK_PACKAGE_FEH
-	select ADK_PACKAGE_XINIT
-	select ADK_PACKAGE_EVILWM
-	select ADK_PACKAGE_DILLO
-	select ADK_PACKAGE_XRDB
-	help
-	  X desktop environment with EvilWM.
-
diff --git a/target/ppc/sys-available/qemu-ppc b/target/ppc/sys-available/qemu-ppc
deleted file mode 100644
index 835741934..000000000
--- a/target/ppc/sys-available/qemu-ppc
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_PPC
-	bool "Qemu Emulator"
-	select ADK_ppc
-	select ADK_qemu_ppc
-	select ADK_CPU_PPC
-	select ADK_TARGET_QEMU
-	help
-	 Support for Qemu Emulator PPC architecture.
-
diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/sys-available/toolchain-ppc
deleted file mode 100644
index 8835ea223..000000000
--- a/target/ppc/sys-available/toolchain-ppc
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC
-	bool "Toolchain only"
-	select ADK_ppc
-	select ADK_toolchain_ppc
-	select ADK_CPU_PPC
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  PPC toolchain.
-
diff --git a/target/ppc/systems/qemu-ppc b/target/ppc/systems/qemu-ppc
new file mode 100644
index 000000000..835741934
--- /dev/null
+++ b/target/ppc/systems/qemu-ppc
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_PPC
+	bool "Qemu Emulator"
+	select ADK_ppc
+	select ADK_qemu_ppc
+	select ADK_CPU_PPC
+	select ADK_TARGET_QEMU
+	help
+	 Support for Qemu Emulator PPC architecture.
+
diff --git a/target/ppc/systems/toolchain-ppc b/target/ppc/systems/toolchain-ppc
new file mode 100644
index 000000000..8835ea223
--- /dev/null
+++ b/target/ppc/systems/toolchain-ppc
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC
+	bool "Toolchain only"
+	select ADK_ppc
+	select ADK_toolchain_ppc
+	select ADK_CPU_PPC
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  PPC toolchain.
+
diff --git a/target/ppc64/sys-available/qemu-ppc64 b/target/ppc64/sys-available/qemu-ppc64
deleted file mode 100644
index a0ff6ada8..000000000
--- a/target/ppc64/sys-available/qemu-ppc64
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_PPC64
-	bool "Qemu Emulator"
-	select ADK_ppc64
-	select ADK_qemu_ppc64
-	select ADK_CPU_PPC64
-	select ADK_LINUX_64
-	select ADK_TARGET_QEMU
-	help
-	 Support for Qemu Emulator PPC64 architecture.
-
diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/sys-available/toolchain-ppc64
deleted file mode 100644
index 0aff9f3a3..000000000
--- a/target/ppc64/sys-available/toolchain-ppc64
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
-	bool "Toolchain only"
-	select ADK_ppc64
-	select ADK_toolchain_ppc64
-	select ADK_CPU_PPC64
-	select ADK_LINUX_64
-	select ADK_TAGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  PPC64 toolchain.
-
diff --git a/target/ppc64/systems/qemu-ppc64 b/target/ppc64/systems/qemu-ppc64
new file mode 100644
index 000000000..a0ff6ada8
--- /dev/null
+++ b/target/ppc64/systems/qemu-ppc64
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_QEMU_PPC64
+	bool "Qemu Emulator"
+	select ADK_ppc64
+	select ADK_qemu_ppc64
+	select ADK_CPU_PPC64
+	select ADK_LINUX_64
+	select ADK_TARGET_QEMU
+	help
+	 Support for Qemu Emulator PPC64 architecture.
+
diff --git a/target/ppc64/systems/toolchain-ppc64 b/target/ppc64/systems/toolchain-ppc64
new file mode 100644
index 000000000..0aff9f3a3
--- /dev/null
+++ b/target/ppc64/systems/toolchain-ppc64
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_PPC64
+	bool "Toolchain only"
+	select ADK_ppc64
+	select ADK_toolchain_ppc64
+	select ADK_CPU_PPC64
+	select ADK_LINUX_64
+	select ADK_TAGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  PPC64 toolchain.
+
diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/sys-available/qemu-sh4
deleted file mode 100644
index 0e0dad617..000000000
--- a/target/sh/sys-available/qemu-sh4
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_SH4
-	bool "Qemu Emulator"
-	select ADK_sh
-	select ADK_qemu_sh4
-	select ADK_CPU_SH4
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	 Support for Qemu Emulator SUPERH architecture.
-
diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/sys-available/toolchain-sh4
deleted file mode 100644
index 0675fe71c..000000000
--- a/target/sh/sys-available/toolchain-sh4
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4
-	bool "Toolchain only"
-	select ADK_sh
-	select ADK_toolchain_sh4
-	select ADK_CPU_SH4
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  SUPERH toolchain.
-
diff --git a/target/sh/systems/qemu-sh4 b/target/sh/systems/qemu-sh4
new file mode 100644
index 000000000..0e0dad617
--- /dev/null
+++ b/target/sh/systems/qemu-sh4
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_QEMU_SH4
+	bool "Qemu Emulator"
+	select ADK_sh
+	select ADK_qemu_sh4
+	select ADK_CPU_SH4
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Qemu Emulator SUPERH architecture.
+
diff --git a/target/sh/systems/toolchain-sh4 b/target/sh/systems/toolchain-sh4
new file mode 100644
index 000000000..0675fe71c
--- /dev/null
+++ b/target/sh/systems/toolchain-sh4
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_SH4
+	bool "Toolchain only"
+	select ADK_sh
+	select ADK_toolchain_sh4
+	select ADK_CPU_SH4
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  SUPERH toolchain.
+
diff --git a/target/sparc/sys-available/qemu-sparc b/target/sparc/sys-available/qemu-sparc
deleted file mode 100644
index 1f1827fe4..000000000
--- a/target/sparc/sys-available/qemu-sparc
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_SPARC
-	bool "Qemu Emulator"
-	select ADK_sparc
-	select ADK_qemu_sparc
-	select ADK_CPU_SPARC_V8
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	 Support for Qemu Emulator SPARC architecture.
-
diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/sys-available/toolchain-sparc
deleted file mode 100644
index be18341f9..000000000
--- a/target/sparc/sys-available/toolchain-sparc
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC
-	bool "Toolchain only"
-	select ADK_sparc
-	select ADK_toolchain_sparc
-	select ADK_CPU_SPARC_V8
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  SPARC toolchain.
-
diff --git a/target/sparc/systems/qemu-sparc b/target/sparc/systems/qemu-sparc
new file mode 100644
index 000000000..1f1827fe4
--- /dev/null
+++ b/target/sparc/systems/qemu-sparc
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_QEMU_SPARC
+	bool "Qemu Emulator"
+	select ADK_sparc
+	select ADK_qemu_sparc
+	select ADK_CPU_SPARC_V8
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Qemu Emulator SPARC architecture.
+
diff --git a/target/sparc/systems/toolchain-sparc b/target/sparc/systems/toolchain-sparc
new file mode 100644
index 000000000..be18341f9
--- /dev/null
+++ b/target/sparc/systems/toolchain-sparc
@@ -0,0 +1,10 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC
+	bool "Toolchain only"
+	select ADK_sparc
+	select ADK_toolchain_sparc
+	select ADK_CPU_SPARC_V8
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  SPARC toolchain.
+
diff --git a/target/sparc64/sys-available/qemu-sparc64 b/target/sparc64/sys-available/qemu-sparc64
deleted file mode 100644
index 93f851e9a..000000000
--- a/target/sparc64/sys-available/qemu-sparc64
+++ /dev/null
@@ -1,10 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_SPARC64
-	bool "Qemu Emulator"
-	select ADK_sparc64
-	select ADK_qemu_sparc64
-	select ADK_LINUX_64
-	select ADK_CPU_SPARC_V9
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_ZIMAGE
-	help
-	 Support for Qemu Emulator SPARC64 architecture.
diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/sys-available/toolchain-sparc64
deleted file mode 100644
index 1cc1edb86..000000000
--- a/target/sparc64/sys-available/toolchain-sparc64
+++ /dev/null
@@ -1,11 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
-	bool "Toolchain only"
-	select ADK_sparc64
-	select ADK_toolchain_sparc64
-	select ADK_CPU_SPARC_V9
-	select ADK_LINUX_64
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  SPARC64 toolchain.
-
diff --git a/target/sparc64/systems/qemu-sparc64 b/target/sparc64/systems/qemu-sparc64
new file mode 100644
index 000000000..2c4ed71a9
--- /dev/null
+++ b/target/sparc64/systems/qemu-sparc64
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_QEMU_SPARC64
+	bool "Qemu Emulator"
+	select ADK_sparc64
+	select ADK_qemu_sparc64
+	select ADK_LINUX_64
+	select ADK_CPU_SPARC_V9
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_ZIMAGE
+	help
+	 Support for Qemu Emulator SPARC64 architecture.
+
diff --git a/target/sparc64/systems/toolchain-sparc64 b/target/sparc64/systems/toolchain-sparc64
new file mode 100644
index 000000000..1cc1edb86
--- /dev/null
+++ b/target/sparc64/systems/toolchain-sparc64
@@ -0,0 +1,11 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_SPARC64
+	bool "Toolchain only"
+	select ADK_sparc64
+	select ADK_toolchain_sparc64
+	select ADK_CPU_SPARC_V9
+	select ADK_LINUX_64
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  SPARC64 toolchain.
+
diff --git a/target/x86/sys-available/generic-pc b/target/x86/sys-available/generic-pc
deleted file mode 100644
index b5bbca9f2..000000000
--- a/target/x86/sys-available/generic-pc
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_GENERIC_PC
-	bool "Generic PC"
-	select ADK_x86
-	select ADK_generic_pc
-	select ADK_TARGET_KERNEL_BZIMAGE
-	select ADK_PACKAGE_GRUB
-	help
-	 Support for generic PC.
-
diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40
deleted file mode 100644
index 4a2d99258..000000000
--- a/target/x86/sys-available/ibm-x40
+++ /dev/null
@@ -1,29 +0,0 @@
-config ADK_TARGET_SYSTEM_IBM_X40
-	bool "IBM X40 laptop"
-	select ADK_x86
-	select ADK_ibm_x40
-	select ADK_CPU_PENTIUM_M
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_SSE
-	select ADK_TARGET_CPU_WITH_SSE2
-	select ADK_TARGET_CPU_WITH_MTRR
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_CPU_FREQ
-	select ADK_TARGET_WITH_USB_BOOT
-	select ADK_TARGET_WITH_CARDBUS
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PATA
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_HDD
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_ACPI
-	# with docking station 
-	select ADK_TARGET_WITH_PP
-	select ADK_TARGET_WITH_ROOT_RW
-	select ADK_TARGET_KERNEL_BZIMAGE
-	select ADK_PACKAGE_GRUB
-	help
-         System profile for IBM X40 laptop.
-
diff --git a/target/x86/sys-available/pcengines-alix1c b/target/x86/sys-available/pcengines-alix1c
deleted file mode 100644
index 484439328..000000000
--- a/target/x86/sys-available/pcengines-alix1c
+++ /dev/null
@@ -1,23 +0,0 @@
-config ADK_TARGET_SYSTEM_PCENGINES_ALIX1C
-	bool "PCEngines ALIX1C"
-	select ADK_x86
-	select ADK_pcengines_alix1c
-	select ADK_CPU_GEODE
-	select ADK_TARGET_CPU_WITH_3DNOW
-        select ADK_TARGET_CPU_WITH_3DNOWEXT
-        select ADK_TARGET_CPU_WITH_MMX
-        select ADK_TARGET_CPU_WITH_MMXEXT
-	select ADK_TARGET_WITH_GEODE_CRYPTO
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_USB_BOOT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_WITH_USB_BOOT
-	select ADK_TARGET_KERNEL_BZIMAGE
-	depends on ADK_BROKEN
-	help
-         System profile for PCEngines ALIX1C. 
-
diff --git a/target/x86/sys-available/pcengines-alix2d13 b/target/x86/sys-available/pcengines-alix2d13
deleted file mode 100644
index 33e939348..000000000
--- a/target/x86/sys-available/pcengines-alix2d13
+++ /dev/null
@@ -1,19 +0,0 @@
-config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13
-	bool "PCEngines ALIX2D13"
-	select ADK_x86
-	select ADK_pcengines_alix2d13
-	select ADK_CPU_GEODE
-	select ADK_TARGET_CPU_WITH_3DNOW
-        select ADK_TARGET_CPU_WITH_3DNOWEXT
-        select ADK_TARGET_CPU_WITH_MMX
-        select ADK_TARGET_CPU_WITH_MMXEXT
-	select ADK_TARGET_WITH_GEODE_CRYPTO
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_RTC
-	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_KERNEL_BZIMAGE
-	depends on ADK_BROKEN
-	help
-         System profile for PCEngines ALIX2D13.
-
diff --git a/target/x86/sys-available/pcengines-alix2d2 b/target/x86/sys-available/pcengines-alix2d2
deleted file mode 100644
index a48bec2cc..000000000
--- a/target/x86/sys-available/pcengines-alix2d2
+++ /dev/null
@@ -1,19 +0,0 @@
-config ADK_TARGET_SYSTEM_PCENGINES_ALIX2D2
-	bool "PCEngines ALIX2D2"
-	select ADK_x86
-	select ADK_pcengines_alix2d2
-	select ADK_CPU_GEODE
-	select ADK_KERNEL_MGEODE_LX
-	select ADK_TARGET_CPU_WITH_3DNOW
-	select ADK_TARGET_CPU_WITH_3DNOWEXT
-	select ADK_TARGET_CPU_WITH_MMX
-	select ADK_TARGET_CPU_WITH_MMXEXT
-	select ADK_TARGET_WITH_GEODE_CRYPTO
-	select ADK_TARGET_WITH_USB
-	select ADK_TARGET_WITH_LEDS
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_KERNEL_BZIMAGE
-	depends on ADK_BROKEN
-	help
-         System profile for PCEngines ALIX2D2.
-
diff --git a/target/x86/sys-available/pcengines-wrap b/target/x86/sys-available/pcengines-wrap
deleted file mode 100644
index 50db08ccf..000000000
--- a/target/x86/sys-available/pcengines-wrap
+++ /dev/null
@@ -1,13 +0,0 @@
-config ADK_TARGET_SYSTEM_PCENGINES_WRAP
-	bool "PCEngines WRAP"
-	select ADK_x86
-	select ADK_pcengines_wrap
-	select ADK_CPU_I486
-	select ADK_KERNEL_I486
-	select ADK_TARGET_WITH_MINIPCI
-	select ADK_TARGET_WITH_WATCHDOG
-	select ADK_TARGET_KERNEL_BZIMAGE
-	depends on ADK_BROKEN
-	help
-         System profile for PCEngines WRAP board.
-
diff --git a/target/x86/sys-available/qemu-x86 b/target/x86/sys-available/qemu-x86
deleted file mode 100644
index 48a71aa1d..000000000
--- a/target/x86/sys-available/qemu-x86
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_QEMU_X86
-	bool "Qemu Emulator"
-	select ADK_x86
-	select ADK_qemu_x86
-	select ADK_TARGET_QEMU
-	select ADK_TARGET_KERNEL_BZIMAGE
-	help
-	 Support for Qemu Emulator X86 architecture.
-
diff --git a/target/x86/sys-available/toolchain-x86 b/target/x86/sys-available/toolchain-x86
deleted file mode 100644
index 1216284bb..000000000
--- a/target/x86/sys-available/toolchain-x86
+++ /dev/null
@@ -1,9 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_X86
-	bool "Toolchain only"
-	select ADK_x86
-	select ADK_toolchain_x86
-	select ADK_TARGET_TOOLCHAIN
-	select ADK_TARGET_PACKAGE_TXZ
-	help
-	  X86 toolchain.
-
diff --git a/target/x86/sys-available/vbox-i686 b/target/x86/sys-available/vbox-i686
deleted file mode 100644
index 97be46ec5..000000000
--- a/target/x86/sys-available/vbox-i686
+++ /dev/null
@@ -1,15 +0,0 @@
-config ADK_TARGET_SYSTEM_VBOX_I686
-	bool "VirtualBox Emulator"
-	select ADK_x86
-	select ADK_vbox_i686
-	select ADK_CPU_I686
-	select ADK_HARDWARE_VBOX
-	select ADK_TARGET_WITH_VGA
-	select ADK_TARGET_WITH_INPUT
-	select ADK_TARGET_WITH_PCI
-	select ADK_TARGET_WITH_HDD
-	select ADK_TARGET_WITH_SATA
-	select ADK_TARGET_KERNEL_BZIMAGE
-	help
-	 Support for VirtualBox Emulator (i686).
-
diff --git a/target/x86/systems/generic-pc b/target/x86/systems/generic-pc
new file mode 100644
index 000000000..b5bbca9f2
--- /dev/null
+++ b/target/x86/systems/generic-pc
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_GENERIC_PC
+	bool "Generic PC"
+	select ADK_x86
+	select ADK_generic_pc
+	select ADK_TARGET_KERNEL_BZIMAGE
+	select ADK_PACKAGE_GRUB
+	help
+	 Support for generic PC.
+
diff --git a/target/x86/systems/ibm-x40 b/target/x86/systems/ibm-x40
new file mode 100644
index 000000000..4a2d99258
--- /dev/null
+++ b/target/x86/systems/ibm-x40
@@ -0,0 +1,29 @@
+config ADK_TARGET_SYSTEM_IBM_X40
+	bool "IBM X40 laptop"
+	select ADK_x86
+	select ADK_ibm_x40
+	select ADK_CPU_PENTIUM_M
+	select ADK_TARGET_CPU_WITH_MMX
+	select ADK_TARGET_CPU_WITH_SSE
+	select ADK_TARGET_CPU_WITH_SSE2
+	select ADK_TARGET_CPU_WITH_MTRR
+	select ADK_TARGET_WITH_VGA
+	select ADK_TARGET_WITH_CPU_FREQ
+	select ADK_TARGET_WITH_USB_BOOT
+	select ADK_TARGET_WITH_CARDBUS
+	select ADK_TARGET_WITH_USB
+	select ADK_TARGET_WITH_INPUT
+	select ADK_TARGET_WITH_PATA
+	select ADK_TARGET_WITH_RTC
+	select ADK_TARGET_WITH_MINIPCI
+	select ADK_TARGET_WITH_HDD
+	select ADK_TARGET_WITH_PCI
+	select ADK_TARGET_WITH_ACPI
+	# with docking station 
+	select ADK_TARGET_WITH_PP
+	select ADK_TARGET_WITH_ROOT_RW
+	select ADK_TARGET_KERNEL_BZIMAGE
+	select ADK_PACKAGE_GRUB
+	help
+         System profile for IBM X40 laptop.
+
diff --git a/target/x86/systems/qemu-x86 b/target/x86/systems/qemu-x86
new file mode 100644
index 000000000..48a71aa1d
--- /dev/null
+++ b/target/x86/systems/qemu-x86
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_QEMU_X86
+	bool "Qemu Emulator"
+	select ADK_x86
+	select ADK_qemu_x86
+	select ADK_TARGET_QEMU
+	select ADK_TARGET_KERNEL_BZIMAGE
+	help
+	 Support for Qemu Emulator X86 architecture.
+
diff --git a/target/x86/systems/toolchain-x86 b/target/x86/systems/toolchain-x86
new file mode 100644
index 000000000..1216284bb
--- /dev/null
+++ b/target/x86/systems/toolchain-x86
@@ -0,0 +1,9 @@
+config ADK_TARGET_SYSTEM_TOOLCHAIN_X86
+	bool "Toolchain only"
+	select ADK_x86
+	select ADK_toolchain_x86
+	select ADK_TARGET_TOOLCHAIN
+	select ADK_TARGET_PACKAGE_TXZ
+	help
+	  X