Browse Source

reorder main menu, prefer uClibc-ng

Waldemar Brodkorb 9 years ago
parent
commit
f964a806c5
2 changed files with 19 additions and 19 deletions
  1. 2 2
      Config.in
  2. 17 17
      target/config/Config.in.libc.choice

+ 2 - 2
Config.in

@@ -22,12 +22,11 @@ source "target/config/Config.in.abi"
 source "target/config/Config.in.arm"
 source "target/config/Config.in.x86"
 source "target/config/Config.in.qemu"
+source "target/config/Config.in.qemuopts"
 source "target/config/Config.in.kernelversion"
-source "target/config/Config.in.toolchain"
 
 menu "Target configuration"
 depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
-source "target/config/Config.in.qemuopts"
 source "target/config/Config.in.libc"
 source "target/config/Config.in.target"
 endmenu
@@ -99,4 +98,5 @@ depends on !ADK_CHOOSE_TARGET_ARCH && !ADK_CHOOSE_TARGET_SYSTEM
 source "target/linux/Config.in"
 endmenu
 
+source "target/config/Config.in.toolchain"
 source "target/config/Config.in.adk"

+ 17 - 17
target/config/Config.in.libc.choice

@@ -5,13 +5,19 @@ choice
 prompt "Target C library"
 depends on !ADK_CHOOSE_TARGET_SYSTEM && !ADK_CHOOSE_TARGET_ARCH
 
-config ADK_TARGET_LIB_GLIBC
-	prompt "GNU C library"
+config ADK_TARGET_LIB_UCLIBC_NG
+	prompt "uClibc-ng embedded C library"
 	boolean
-	select ADK_glibc
-	depends on !ADK_LINUX_XTENSA
+	select ADK_uclibc_ng
+	depends on \
+		   !ADK_LINUX_AARCH64 && \
+		   !ADK_LINUX_ALPHA && \
+		   !ADK_LINUX_SPARC && \
+		   !ADK_LINUX_SPARC64 && \
+		   !ADK_LINUX_PPC64 && \
+		   !ADK_x32
 	help
-	  http://www.gnu.org/libc
+	  http://uclibc-ng.org
 
 config ADK_TARGET_LIB_MUSL
 	prompt "musl C library"
@@ -28,22 +34,16 @@ config ADK_TARGET_LIB_MUSL
 	help
  	  http://musl-libc.org
 
-config ADK_TARGET_LIB_UCLIBC_NG
-	prompt "uClibc-ng embedded C library"
+config ADK_TARGET_LIB_GLIBC
+	prompt "GNU C library"
 	boolean
-	select ADK_uclibc_ng
-	depends on \
-		   !ADK_LINUX_AARCH64 && \
-		   !ADK_LINUX_ALPHA && \
-		   !ADK_LINUX_SPARC && \
-		   !ADK_LINUX_SPARC64 && \
-		   !ADK_LINUX_PPC64 && \
-		   !ADK_x32
+	select ADK_glibc
+	depends on !ADK_LINUX_XTENSA
 	help
-	  http://uclibc-ng.org
+	  http://www.gnu.org/libc
 
 config ADK_TARGET_LIB_UCLIBC
-	prompt "uClibc embedded C library"
+	prompt "uClibc embedded C library (deprecated)"
 	boolean
 	select ADK_uclibc
 	depends on \