refresh bulk and target lists

6 files changed, 19 insertions, 44 deletions

diff --git a/mk/build.mk b/mk/build.mk
index 7e0fe8e2a..d7feac37c 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -337,18 +337,12 @@ endif
 ifneq (,$(filter %_toolchain,${TARGET}))
 	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/.defconfig
 endif
-ifneq (,$(filter rescue%,${TARGET}))
-	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig
-endif
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig
 endif
 ifneq (,$(filter alix%,${TARGET}))
 	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
 endif
-ifneq (,$(filter wrap%,${TARGET}))
-	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig
-endif
 	@if [ ! -z "$(TARGET)" ];then \
 		$(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \
 	fi
@@ -414,18 +408,12 @@ endif
 ifneq (,$(filter %_toolchain,${TARGET}))
 	@echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/all.config
 endif
-ifneq (,$(filter %_rescue,${TARGET}))
-	@echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config
-endif
 ifneq (,$(filter rb%,${TARGET}))
 	@echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config
 endif
 ifneq (,$(filter alix%,${TARGET}))
 	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
 endif
-ifneq (,$(filter wrap%,${TARGET}))
-	@echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config
-endif
 
 menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto
 	@if [ ! -f .config ];then \
diff --git a/target/Config.in b/target/Config.in
index 626ad793b..50e72ef5f 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -206,10 +206,7 @@ menu "Target system"
 
 choice
 prompt "Embedded Device or Emulator"
-default ADK_CHOOSE_TARGET
-
-config ADK_CHOOSE_TARGET
-	bool "choose a target"
+default ADK_LINUX_NATIVE
 
 config ADK_LINUX_NATIVE
 	bool "Native platform"
diff --git a/target/bulk.lst b/target/bulk.lst
index 72bf5c124..d13d12ac3 100644
--- a/target/bulk.lst
+++ b/target/bulk.lst
@@ -1,6 +1,8 @@
 ag241		uclibc		nfsroot
 foxboard	uclibc		nfsroot
 foxg20		uclibc		nfsroot
+foxg20		eglibc		nfsroot
+foxg20		glibc		nfsroot
 rb4xx		uclibc		nfsroot
 rb4xx		eglibc		nfsroot
 rb4xx		glibc		nfsroot
@@ -22,14 +24,11 @@ mips_qemu	glibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	eglibc		archive
 mipsel_qemu	glibc		archive
-x86_qemu	uclibc		archive
-x86_qemu	eglibc		archive
-x86_qemu	glibc		archive
-x86_64_qemu	uclibc		archive
-x86_64_qemu	eglibc		archive
-x86_64_qemu	glibc		archive
 lemote		eglibc		archive
 lemote		glibc		archive
 x86		uclibc		archive
 x86		eglibc		archive
 x86		glibc		archive
+x86_64		uclibc		archive
+x86_64		eglibc		archive
+x86_64		glibc		archive
diff --git a/target/bulkdef.lst b/target/bulkdef.lst
index e100ea2c7..88a29a56b 100644
--- a/target/bulkdef.lst
+++ b/target/bulkdef.lst
@@ -4,6 +4,10 @@ foxboard	uclibc		nfsroot
 foxboard	uclibc		squashfs
 foxg20		uclibc		nfsroot
 foxg20		uclibc		ext2-block
+foxg20		eglibc		nfsroot
+foxg20		eglibc		ext2-block
+foxg20		glibc		nfsroot
+foxg20		glibc		ext2-block
 rb4xx		uclibc		nfsroot
 rb4xx		eglibc		nfsroot
 rb4xx		glibc		nfsroot
@@ -40,18 +44,6 @@ mips_qemu	glibc		archive
 mipsel_qemu	uclibc		archive
 mipsel_qemu	eglibc		archive
 mipsel_qemu	glibc		archive
-x86_qemu	uclibc		archive
-x86_qemu	eglibc		archive
-x86_qemu	glibc		archive
-x86_qemu	uclibc		initramfs
-x86_qemu	eglibc		initramfs
-x86_qemu	glibc		initramfs
-x86_64_qemu	uclibc		archive
-x86_64_qemu	eglibc		archive
-x86_64_qemu	glibc		archive
-x86_64_qemu	uclibc		initramfs
-x86_64_qemu	eglibc		initramfs
-x86_64_qemu	glibc		initramfs
 lemote		eglibc		archive
 lemote		glibc		archive
 lemote		eglibc		initramfs
@@ -67,6 +59,12 @@ x86		glibc		initramfs
 x86		uclibc		initramfs-piggyback
 x86		eglibc		initramfs-piggyback
 x86		glibc		initramfs-piggyback
-shuttle		uclibc		archive
-shuttle		eglibc		archive
-shuttle		glibc		archive
+x86_64		uclibc		archive
+x86_64		eglibc		archive
+x86_64		glibc		archive
+x86_64		uclibc		initramfs
+x86_64		eglibc		initramfs
+x86_64		glibc		initramfs
+x86_64		uclibc		initramfs-piggyback
+x86_64		eglibc		initramfs-piggyback
+x86_64		glibc		initramfs-piggyback
diff --git a/target/bulktool.lst b/target/bulktool.lst
index abafba6d9..6869b1dbd 100644
--- a/target/bulktool.lst
+++ b/target/bulktool.lst
@@ -10,6 +10,3 @@ mips_toolchain	glibc
 mipsel_toolchain	uclibc
 mipsel_toolchain	eglibc
 mipsel_toolchain	glibc
-ppc_toolchain	uclibc
-ppc_toolchain	eglibc
-ppc_toolchain	glibc
diff --git a/target/target.lst b/target/target.lst
index 1d4f94e95..6220f3f69 100644
--- a/target/target.lst
+++ b/target/target.lst
@@ -10,8 +10,6 @@ arm_toolchain	ADK_LINUX_ARM_TOOLCHAIN
 armel_toolchain	ADK_LINUX_ARMEL_TOOLCHAIN
 mips_toolchain	ADK_LINUX_MIPS_TOOLCHAIN
 mipsel_toolchain	ADK_LINUX_MIPSEL_TOOLCHAIN
-ppc_toolchain	ADK_LINUX_PPC_TOOLCHAIN
-sparc_toolchain	ADK_LINUX_SPARC_TOOLCHAIN
 toolchain	ADK_LINUX_ARM_TOOLCHAIN ADK_LINUX_ARMEL_TOOLCHAIN ADK_LINUX_MIPS_TOOLCHAIN ADK_LINUX_MIPSEL_TOOLCHAIN ADK_LINUX_PPC_TOOLCHAIN ADK_LINUX_SPARC_TOOLCHAIN
 arm_qemu	ADK_LINUX_ARM_QEMU
 mips_qemu	ADK_LINUX_MIPS_QEMU
@@ -19,8 +17,6 @@ mipsel_qemu	ADK_LINUX_MIPSEL_QEMU
 mips64_qemu	ADK_LINUX_MIPS64_QEMU
 mips64el_qemu	ADK_LINUX_MIPS64EL_QEMU
 cris_qemu	ADK_LINUX_CRIS_QEMU
-x86_qemu	ADK_LINUX_X86_QEMU
-x86_64_qemu	ADK_LINUX_X86_64_QEMU
 qemu	ADK_LINUX_ARM_QEMU ADK_LINUX_MIPS_QEMU ADK_LINUX_MIPSEL_QEMU ADK_LINUX_MIPS64_QEMU ADK_LINUX_MIPS64EL_QEMU ADK_LINUX_CRIS_QEMU ADK_LINUX_X86_QEMU ADK_LINUX_X86_64_QEMU
 rb4xx	ADK_LINUX_MIPS_RB4XX
 rb532	ADK_LINUX_MIPS_RB532