Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 30 insertions, 48 deletions

diff --git a/target/arm/sys-available/keyasic-ka2000 b/target/arm/sys-available/keyasic-ka2000
index 3c9573ebe..36434269c 100644
--- a/target/arm/sys-available/keyasic-ka2000
+++ b/target/arm/sys-available/keyasic-ka2000
@@ -7,8 +7,8 @@ config ADK_TARGET_SYSTEM_KEYASIC_KA2000
 	select ADK_EABI
 	select ADK_CPU_ARM926EJ_S
 	select ADK_TOOLCHAIN
-	select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL
-	select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC || ADK_TARGET_LIB_MUSL
+	select ADK_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
+	select BUSYBOX_STATIC if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_MUSL
 	help
 	  KeyASIC KA2000 aka Transcend WifiSD.
 	  Build a toolchain only and make all binaries static.
diff --git a/target/config/Config.in b/target/config/Config.in
index 44c9a8d20..44ee685fe 100644
--- a/target/config/Config.in
+++ b/target/config/Config.in
@@ -622,9 +622,6 @@ config ADK_TARGET_CMDLINE
 config ADK_uclibc
 	boolean
 
-config ADK_eglibc
-	boolean
-
 config ADK_glibc
 	boolean
 
@@ -637,7 +634,6 @@ config ADK_libc
 config ADK_TARGET_LIBC
 	string
 	default "uclibc"  if ADK_uclibc
-	default "eglibc"  if ADK_eglibc
 	default "glibc"  if ADK_glibc
 	default "musl"  if ADK_musl
 	default "libc"  if ADK_libc
@@ -659,27 +655,6 @@ config ADK_TARGET_LIB_UCLIBC
 	help
  	 http://uclibc.org
 
-config ADK_TARGET_LIB_EGLIBC
-	prompt "Embedded GNU C library"
-	boolean
-	select ADK_eglibc
-	select ADK_HOST_NEED_GPERF
-	depends on \
-		ADK_LINUX_ARM || \
-		ADK_LINUX_ARMEB || \
-		ADK_LINUX_M68K || \
-		ADK_LINUX_MICROBLAZE || \
-		ADK_LINUX_MIPS || \
-		ADK_LINUX_PPC || \
-		ADK_LINUX_PPC64 || \
-		ADK_LINUX_SH || \
-		ADK_LINUX_SPARC || \
-		ADK_LINUX_SPARC64 || \
-		ADK_LINUX_X86 || \
-		ADK_LINUX_X86_64
-	help
-	 http://www.eglibc.org
-
 config ADK_TARGET_LIB_GLIBC
 	prompt "GNU C library"
 	boolean
@@ -725,27 +700,30 @@ endchoice
 
 config ADK_TARGET_SUFFIX
 	string
-	default "gnueabihf" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABIHF
-	default "gnueabi" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_EABI
-	default "gnuabi64" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n64
-	default "gnuabin32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_n32
-	default "gnuabi32" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && ADK_o32
-	default "gnu" if (ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC) && !ADK_EABI
+	default "gnueabihf" if ADK_TARGET_LIB_GLIBC && ADK_EABIHF
+	default "gnueabi" if ADK_TARGET_LIB_GLIBC && ADK_EABI
+	default "gnuabi64" if ADK_TARGET_LIB_GLIBC && ADK_n64 && ADK_TARGET_KERNEL64
+	default "gnuabin32" if ADK_TARGET_LIB_GLIBC && ADK_n32 && ADK_TARGET_KERNEL64
+	default "gnuabi32" if ADK_TARGET_LIB_GLIBC && ADK_o32 && ADK_TARGET_KERNEL64
+	default "gnu32" if ADK_TARGET_LIB_GLIBC && ADK_32 && ADK_TARGET_KERNEL64
+	default "gnux32" if ADK_TARGET_LIB_GLIBC && ADK_x32 && ADK_TARGET_KERNEL64
+	default "gnu" if ADK_TARGET_LIB_GLIBC
 	default "uclibcgnueabihf" if ADK_TARGET_LIB_UCLIBC && ADK_EABIHF
 	default "uclibcgnueabi" if ADK_TARGET_LIB_UCLIBC && ADK_EABI
-	default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64
-	default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32
-	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32
-	default "uclibc" if ADK_TARGET_LIB_UCLIBC && !ADK_EABI
+	default "uclibcabi64" if ADK_TARGET_LIB_UCLIBC && ADK_n64 && ADK_TARGET_KERNEL64
+	default "uclibcabin32" if ADK_TARGET_LIB_UCLIBC && ADK_n32 && ADK_TARGET_KERNEL64
+	default "uclibcabi32" if ADK_TARGET_LIB_UCLIBC && ADK_o32 && ADK_TARGET_KERNEL64
+	default "uclibc32" if ADK_TARGET_LIB_UCLIBC && ADK_32 && ADK_TARGET_KERNEL64
+	default "uclibcx32" if ADK_TARGET_LIB_UCLIBC && ADK_x32 && ADK_TARGET_KERNEL64
+	default "uclibc" if ADK_TARGET_LIB_UCLIBC
 	default "muslgnueabihf" if ADK_TARGET_LIB_MUSL && ADK_EABIHF
 	default "muslgnueabi" if ADK_TARGET_LIB_MUSL && ADK_EABI
-	default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64
-	default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32
-	default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32
+	default "muslabi64" if ADK_TARGET_LIB_MUSL && ADK_n64 && ADK_TARGET_KERNEL64
+	default "muslabin32" if ADK_TARGET_LIB_MUSL && ADK_n32 && ADK_TARGET_KERNEL64
+	default "muslabi32" if ADK_TARGET_LIB_MUSL && ADK_o32 && ADK_TARGET_KERNEL64
+	default "musl32" if ADK_TARGET_LIB_MUSL && ADK_32 && ADK_TARGET_KERNEL64
+	default "muslx32" if ADK_TARGET_LIB_MUSL && ADK_x32 && ADK_TARGET_KERNEL64
 	default "musl" if ADK_TARGET_LIB_MUSL
-	default "32" if ADK_32
-	default "x32" if ADK_x32
-	default "gnu"
 
 choice
 prompt "Target firmware type"
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index cf92eadee..d863179b8 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -6,10 +6,6 @@ config ADK_HOST_NEED_SYSLINUX
 	boolean
 	default n
 
-config ADK_HOST_NEED_GPERF
-	boolean
-	default n
-
 config ADK_HOST_NEED_SQUASHFS
 	boolean
 	default n
diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development
index 6da3a5564..b4a9bff9f 100644
--- a/target/packages/pkg-available/development
+++ b/target/packages/pkg-available/development
@@ -13,7 +13,6 @@ config ADK_PKG_DEVELOPMENT
 	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_EGLIBC_DEV if ADK_TARGET_LIB_EGLIBC
 	select ADK_PACKAGE_GLIBC_DEV if ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBNCURSES_DEV
diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test
new file mode 100644
index 000000000..d7bbcf26a
--- /dev/null
+++ b/target/packages/pkg-available/test
@@ -0,0 +1,9 @@
+config ADK_PKG_TEST
+	bool "Compile a ADK test framework system"
+	default n
+	select ADK_PACKAGE_STRACE
+	select ADK_PACKAGE_SOCAT
+	select ADK_PACKAGE_MAKE
+	help
+	  Package collection used to build adk-test-framework root
+	  filesystem.