59 files changed, 23 insertions, 211 deletions

diff --git a/.gitignore b/.gitignore
index 030499b1d..acf4e2d5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,22 +46,14 @@
 /make.log
 /dl
 /package/Config.in.auto*
+/package/Config.in.collections
 /package/pkgconfigs.d/
-/package/*/Config.in
-/package/*/Config.in.lib
-/package/*/Config.in.kmod
 /extra/
 /.menu
 /.adkinit
 /target/*/Config.in.systems
-/target/*/sys-enabled
-/target/packages/pkg-enabled
-/target/packages/Config.in
 /target/config/Config.in.system.default
-/target/config/Config.in.system
 /target/config/Config.in.scripts
-/target/config/Config.in.native
-/target/config/Config.in.arch
 /target/config/Config.in.prereq
 /target/m68k/aranym.cfg
 /scripts/toolchain.cmake
diff --git a/Config.in b/Config.in
index de2c0225e..b33c53dbd 100644
--- a/Config.in
+++ b/Config.in
@@ -42,7 +42,7 @@ source "target/config/Config.in"
 
 menu "Package collection"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
-source "target/packages/Config.in"
+source "package/Config.in.collections"
 endmenu
 
 menu "Package selection"
diff --git a/Makefile b/Makefile
index d485bcea5..792a1df96 100644
--- a/Makefile
+++ b/Makefile
@@ -133,8 +133,6 @@ allconfig: .prereq_done
 	@${GMAKE_INV} _mconfig W=-y RCONFIG=Config.in
 
 allmodconfig: .prereq_done
-	@${BASH} ${TOPDIR}/scripts/update-sys
-	@${BASH} ${TOPDIR}/scripts/update-pkg
 	@${GMAKE_INV} _mconfig W=-o RCONFIG=Config.in
 
 package_index: .prereq_done
diff --git a/mk/build.mk b/mk/build.mk
index 91e45a17c..da0067e20 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -138,8 +138,6 @@ world:
 	mkdir -p $(DL_DIR) $(HOST_BUILD_DIR) $(BUILD_DIR) $(TARGET_DIR) $(FW_DIR) \
 		$(STAGING_HOST_DIR) $(TOOLCHAIN_BUILD_DIR) $(STAGING_PKG_DIR)/stamps
 	${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
-	${BASH} ${TOPDIR}/scripts/update-sys
-	${BASH} ${TOPDIR}/scripts/update-pkg
 ifeq ($(ADK_TOOLCHAIN),y)
 ifeq ($(ADK_TOOLCHAIN_ONLY),y)
 	$(MAKE) -f mk/build.mk package/hostcompile toolchain/fixup package/compile
@@ -273,8 +271,6 @@ $(CONFIG)/mconf:
 	@$(MAKE) -C $(CONFIG)
 
 defconfig: .menu $(CONFIG)/conf
-	@${BASH} ${TOPDIR}/scripts/update-sys
-	@${BASH} ${TOPDIR}/scripts/update-pkg
 ifeq (${OStype},Linux)
 	@echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig
 endif
@@ -394,8 +390,6 @@ endif
 	fi
 
 menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto
-	@${BASH} ${TOPDIR}/scripts/update-sys
-	@${BASH} ${TOPDIR}/scripts/update-pkg
 	@if [ ! -f .config ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
 	fi
diff --git a/scripts/create-pkg b/scripts/create-pkg
index 35961ae54..a41d379d2 100755
--- a/scripts/create-pkg
+++ b/scripts/create-pkg
@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-
-mkdir -p $topdir/target/packages/pkg-enabled
-rm $topdir/target/packages/pkg-enabled/* 2>/dev/null
-count=1
-for i in $(ls $topdir/target/packages/pkg-available/);do
-	cd $topdir/target/packages/pkg-enabled &&
-	ln -sf ../pkg-available/$i $count-$i
-	count=$((count+1))
-done
+if [ -d "$topdir/target/collections" ];then
+	cat $topdir/target/collections/* > $topdir/package/Config.in.collections 2>/dev/null
+fi
+exit 0
diff --git a/scripts/create-sys b/scripts/create-sys
index d34a0e443..e60428a45 100755
--- a/scripts/create-sys
+++ b/scripts/create-sys
@@ -1,21 +1,8 @@
 #!/usr/bin/env bash
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-systems=$(grep -h config target/*/sys-available/*|cut -d " " -f 2)
-
-while read arch; do
-	count=0
-	rm -rf $topdir/target/$arch/sys-enabled &&
-	mkdir -p $topdir/target/$arch/sys-enabled &&
-	cd $topdir/target/$arch/sys-enabled &&
-	for i in $(ls $topdir/target/$arch/sys-available/);do
-		cd $topdir/target/$arch/sys-enabled/ &&
-		ln -sf ../sys-available/$i $count-$i
-		count=$((count+1))
-	done
-done <${topdir}/target/arch.lst
+systems=$(grep -h config target/*/systems/*|cut -d " " -f 2)
 
 echo '' > $topdir/target/config/Config.in.system.default
-
 for j in $systems;do
 	system=${j#ADK_TARGET_SYSTEM_}
 	systemu=$(echo $system|tr '[:upper:]' '[:lower:]')
@@ -38,4 +25,10 @@ for i in $systems;do
 		printf "\tdefault \"${system}\" if ADK_$systemu\n" >> $topdir/target/config/Config.in.system.default
 	fi
 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
+	fi
+done
 exit 0
diff --git a/scripts/update-pkg b/scripts/update-pkg
deleted file mode 100755
index 4fb16fbe3..000000000
--- a/scripts/update-pkg
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-# create package collection Config.in file
-
-topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-if [ -d "$topdir/target/packages/pkg-enabled" ];then
-	cat $topdir/target/packages/pkg-enabled/* > $topdir/target/packages/Config.in 2>/dev/null
-fi
-exit 0
diff --git a/scripts/update-sys b/scripts/update-sys
deleted file mode 100755
index e4f584c33..000000000
--- a/scripts/update-sys
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# create Config.in.systems with all available target systems for each architecture
-
-topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
-
-echo 'source "target/config/Config.in.arch.default"' > $topdir/target/config/Config.in.arch
-echo 'source "target/config/Config.in.arch.choice"' >> $topdir/target/config/Config.in.arch
-echo 'source "target/config/Config.in.system.default"' > $topdir/target/config/Config.in.system
-echo 'source "target/config/Config.in.system.choice"' >> $topdir/target/config/Config.in.system
-
-for i in $(ls $topdir/target/);do
-	if [ -d "$topdir/target/$i/sys-enabled" ];then
-		cat $topdir/target/$i/sys-enabled/* > $topdir/target/$i/Config.in.systems 2>/dev/null
-	fi
-done
-exit 0
diff --git a/target/aarch64/sys-available/arm-fm b/target/aarch64/systems/arm-fm
index 4eef2aeaf..4eef2aeaf 100644
--- a/target/aarch64/sys-available/arm-fm
+++ b/target/aarch64/systems/arm-fm
diff --git a/target/aarch64/sys-available/toolchain-aarch64 b/target/aarch64/systems/toolchain-aarch64
index bcdfd2289..15a106e42 100644
--- a/target/aarch64/sys-available/toolchain-aarch64
+++ b/target/aarch64/systems/toolchain-aarch64
@@ -1,5 +1,5 @@
 config ADK_TARGET_SYSTEM_TOOLCHAIN_AARCH64
-	bool "Toolchain only (little endian)"
+	bool "Toolchain only"
 	select ADK_aarch64
 	select ADK_toolchain_aarch64
 	select ADK_little
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/systems/cubox-i
index d3edb99c6..d3edb99c6 100644
--- a/target/arm/sys-available/cubox-i
+++ b/target/arm/systems/cubox-i
diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/systems/keyasic-ka2000
index c63e73ef7..c63e73ef7 100644
--- a/target/arm/sys-available/keyasic-ka2000
+++ b/target/arm/systems/keyasic-ka2000
diff --git a/target/arm/sys-available/qemu-arm b/target/arm/systems/qemu-arm
index 848179629..196ae6e75 100644
--- a/target/arm/sys-available/qemu-arm
+++ b/target/arm/systems/qemu-arm
@@ -7,4 +7,5 @@ config ADK_TARGET_SYSTEM_QEMU_ARM
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
-	  Qemu Emulator for arm architecture.
+	  Qemu Emulator for ARM architecture.
+
diff --git a/target/arm/sys-available/raspberry-pi b/target/arm/systems/raspberry-pi
index 45fd531d3..45fd531d3 100644
--- a/target/arm/sys-available/raspberry-pi
+++ b/target/arm/systems/raspberry-pi
diff --git a/target/arm/sys-available/sharp-zaurus b/target/arm/systems/sharp-zaurus
index 563866960..195ed9c0e 100644
--- a/target/arm/sys-available/sharp-zaurus
+++ b/target/arm/systems/sharp-zaurus
@@ -14,3 +14,4 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Sharp Zaurus CL3200 (Terrier)
+
diff --git a/target/arm/sys-available/toolchain-arm b/target/arm/systems/toolchain-arm
index a98f9c225..a98f9c225 100644
--- a/target/arm/sys-available/toolchain-arm
+++ b/target/arm/systems/toolchain-arm
diff --git a/target/packages/pkg-available/console b/target/collections/console
index 566ba8aac..566ba8aac 100644
--- a/target/packages/pkg-available/console
+++ b/target/collections/console
diff --git a/target/packages/pkg-available/development b/target/collections/development
index 62404159f..62404159f 100644
--- a/target/packages/pkg-available/development
+++ b/target/collections/development
diff --git a/target/packages/pkg-available/mpdbox b/target/collections/mpdbox
index 46a6d4bb2..46a6d4bb2 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/collections/mpdbox
diff --git a/target/packages/pkg-available/test b/target/collections/test
index 0ff042eef..0ff042eef 100644
--- a/target/packages/pkg-available/test
+++ b/target/collections/test
diff --git a/target/packages/pkg-available/xorg b/target/collections/xorg
index 75ee6bb18..75ee6bb18 100644
--- a/target/packages/pkg-available/xorg
+++ b/target/collections/xorg
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/systems/aranym-m68k
index 29e8810a5..29e8810a5 100644
--- a/target/m68k/sys-available/aranym-m68k
+++ b/target/m68k/systems/aranym-m68k
diff --git a/target/m68k/sys-available/toolchain-m68k b/target/m68k/systems/toolchain-m68k
index f7218cdbd..12249bd97 100644
--- a/target/m68k/sys-available/toolchain-m68k
+++ b/target/m68k/systems/toolchain-m68k
@@ -5,5 +5,5 @@ config ADK_TARGET_SYSTEM_TOOLCHAIN_M68K
 	select ADK_TARGET_TOOLCHAIN
 	select ADK_TARGET_PACKAGE_TXZ
 	help
-	  Build a m68k toolchain.
+	  M68K toolchain.
 
diff --git a/target/microblaze/sys-available/qemu-microblaze b/target/microblaze/systems/qemu-microblaze
index ac4a36e9d..ac4a36e9d 100644
--- a/target/microblaze/sys-available/qemu-microblaze
+++ b/target/microblaze/systems/qemu-microblaze
diff --git a/target/microblaze/sys-available/toolchain-microblaze b/target/microblaze/systems/toolchain-microblaze
index e01ed69a0..e01ed69a0 100644
--- a/target/microblaze/sys-available/toolchain-microblaze
+++ b/target/microblaze/systems/toolchain-microblaze
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/systems/mikrotik-rb532
index 505abf651..505abf651 100644
--- a/target/mips/sys-available/mikrotik-rb532
+++ b/target/mips/systems/mikrotik-rb532
diff --git a/target/mips/sys-available/qemu-mips b/target/mips/systems/qemu-mips
index 2dfc09ca6..2dfc09ca6 100644
--- a/target/mips/sys-available/qemu-mips
+++ b/target/mips/systems/qemu-mips
diff --git a/target/mips/sys-available/toolchain-mips b/target/mips/systems/toolchain-mips
index 035908220..035908220 100644
--- a/target/mips/sys-available/toolchain-mips
+++ b/target/mips/systems/toolchain-mips
diff --git a/target/mips64/sys-available/lemote-yeelong b/target/mips64/systems/lemote-yeelong
index 65f400048..65f400048 100644
--- a/target/mips64/sys-available/lemote-yeelong
+++ b/target/mips64/systems/lemote-yeelong
diff --git a/target/mips64/sys-available/qemu-mips64 b/target/mips64/systems/qemu-mips64
index f8846f472..f8846f472 100644
--- a/target/mips64/sys-available/qemu-mips64
+++ b/target/mips64/systems/qemu-mips64
diff --git a/target/mips64/sys-available/toolchain-mips64 b/target/mips64/systems/toolchain-mips64
index 909de4aad..909de4aad 100644
--- a/target/mips64/sys-available/toolchain-mips64
+++ b/target/mips64/systems/toolchain-mips64
diff --git a/target/ppc/sys-available/qemu-ppc b/target/ppc/systems/qemu-ppc
index 835741934..835741934 100644
--- a/target/ppc/sys-available/qemu-ppc
+++ b/target/ppc/systems/qemu-ppc
diff --git a/target/ppc/sys-available/toolchain-ppc b/target/ppc/systems/toolchain-ppc
index 8835ea223..8835ea223 100644
--- a/target/ppc/sys-available/toolchain-ppc
+++ b/target/ppc/systems/toolchain-ppc
diff --git a/target/ppc64/sys-available/qemu-ppc64 b/target/ppc64/systems/qemu-ppc64
index a0ff6ada8..a0ff6ada8 100644
--- a/target/ppc64/sys-available/qemu-ppc64
+++ b/target/ppc64/systems/qemu-ppc64
diff --git a/target/ppc64/sys-available/toolchain-ppc64 b/target/ppc64/systems/toolchain-ppc64
index 0aff9f3a3..0aff9f3a3 100644
--- a/target/ppc64/sys-available/toolchain-ppc64
+++ b/target/ppc64/systems/toolchain-ppc64
diff --git a/target/sh/sys-available/qemu-sh4 b/target/sh/systems/qemu-sh4
index 0e0dad617..0e0dad617 100644
--- a/target/sh/sys-available/qemu-sh4
+++ b/target/sh/systems/qemu-sh4
diff --git a/target/sh/sys-available/toolchain-sh4 b/target/sh/systems/toolchain-sh4
index 0675fe71c..0675fe71c 100644
--- a/target/sh/sys-available/toolchain-sh4
+++ b/target/sh/systems/toolchain-sh4
diff --git a/target/sparc/sys-available/qemu-sparc b/target/sparc/systems/qemu-sparc
index 1f1827fe4..1f1827fe4 100644
--- a/target/sparc/sys-available/qemu-sparc
+++ b/target/sparc/systems/qemu-sparc
diff --git a/target/sparc/sys-available/toolchain-sparc b/target/sparc/systems/toolchain-sparc
index be18341f9..be18341f9 100644
--- a/target/sparc/sys-available/toolchain-sparc
+++ b/target/sparc/systems/toolchain-sparc
diff --git a/target/sparc64/sys-available/qemu-sparc64 b/target/sparc64/systems/qemu-sparc64
index 93f851e9a..2c4ed71a9 100644
--- a/target/sparc64/sys-available/qemu-sparc64
+++ b/target/sparc64/systems/qemu-sparc64
@@ -8,3 +8,4 @@ config ADK_TARGET_SYSTEM_QEMU_SPARC64
 	select ADK_TARGET_KERNEL_ZIMAGE
 	help
 	 Support for Qemu Emulator SPARC64 architecture.
+
diff --git a/target/sparc64/sys-available/toolchain-sparc64 b/target/sparc64/systems/toolchain-sparc64
index 1cc1edb86..1cc1edb86 100644
--- a/target/sparc64/sys-available/toolchain-sparc64
+++ b/target/sparc64/systems/toolchain-sparc64
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/generic-pc b/target/x86/systems/generic-pc
index b5bbca9f2..b5bbca9f2 100644
--- a/target/x86/sys-available/generic-pc
+++ b/target/x86/systems/generic-pc
diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/systems/ibm-x40
index 4a2d99258..4a2d99258 100644
--- a/target/x86/sys-available/ibm-x40
+++ b/target/x86/systems/ibm-x40
diff --git a/target/x86/sys-available/qemu-x86 b/target/x86/systems/qemu-x86
index 48a71aa1d..48a71aa1d 100644
--- a/target/x86/sys-available/qemu-x86
+++ b/target/x86/systems/qemu-x86
diff --git a/target/x86/sys-available/toolchain-x86 b/target/x86/systems/toolchain-x86
index 1216284bb..1216284bb 100644
--- a/target/x86/sys-available/toolchain-x86
+++ b/target/x86/systems/toolchain-x86
diff --git a/target/x86/sys-available/vbox-i686 b/target/x86/systems/vbox-i686
index 97be46ec5..97be46ec5 100644
--- a/target/x86/sys-available/vbox-i686
+++ b/target/x86/systems/vbox-i686
diff --git a/target/x86_64/sys-available/qemu-x86_64 b/target/x86_64/systems/qemu-x86_64
index 11e5c92cb..11e5c92cb 100644
--- a/target/x86_64/sys-available/qemu-x86_64
+++ b/target/x86_64/systems/qemu-x86_64
diff --git a/target/x86_64/sys-available/toolchain-x86_64 b/target/x86_64/systems/toolchain-x86_64
index ab4bfa86e..ab4bfa86e 100644
--- a/target/x86_64/sys-available/toolchain-x86_64
+++ b/target/x86_64/systems/toolchain-x86_64