Prechádzať zdrojové kódy

use static lib option for noMMU. do some style fixes.

Waldemar Brodkorb 9 rokov pred
rodič
commit
3911b4babe
2 zmenil súbory, kde vykonal 11 pridanie a 13 odobranie
  1. 11 11
      target/config/Config.in
  2. 0 2
      target/config/Config.in.toolchain

+ 11 - 11
target/config/Config.in

@@ -3,47 +3,47 @@
 
 
 # global symbols
 # global symbols
 config ADK_LINUX_64
 config ADK_LINUX_64
-	boolean
+	bool
 
 
 config ADK_TARGET_KERNEL_64
 config ADK_TARGET_KERNEL_64
-	boolean
+	bool
 
 
 config ADK_TOOLCHAIN_ONLY
 config ADK_TOOLCHAIN_ONLY
-	boolean
+	bool
 
 
 config ADK_TARGET_TOOLCHAIN
 config ADK_TARGET_TOOLCHAIN
-	boolean
+	bool
 
 
 config ADK_TARGET_UCLINUX
 config ADK_TARGET_UCLINUX
+	bool
+	select ADK_TARGET_USE_STATIC_LIBS
 	select ADK_PACKAGE_SASH
 	select ADK_PACKAGE_SASH
 	select ADK_PACKAGE_SIMPLEINIT
 	select ADK_PACKAGE_SIMPLEINIT
-	boolean
 
 
 config ADK_TARGET_QEMU
 config ADK_TARGET_QEMU
-	boolean
+	bool
 
 
 config ADK_TARGET_VBOX
 config ADK_TARGET_VBOX
-	boolean
+	bool
 
 
 # the inverse of ADK_TARGET_KERNEL_CUSTOMISING,
 # the inverse of ADK_TARGET_KERNEL_CUSTOMISING,
 # allows for selecting it off (i.e., to disable it)
 # allows for selecting it off (i.e., to disable it)
 config ADK_TARGET_FIXED_KERNEL
 config ADK_TARGET_FIXED_KERNEL
 	bool
 	bool
-	default n
 
 
 config ADK_TARGET_KERNEL_CUSTOMISING
 config ADK_TARGET_KERNEL_CUSTOMISING
 	bool
 	bool
-	default y
 	depends on !ADK_TARGET_FIXED_KERNEL
 	depends on !ADK_TARGET_FIXED_KERNEL
+	default y
 
 
 choice
 choice
 prompt "Toolchain options"
 prompt "Toolchain options"
 depends on ADK_TARGET_TOOLCHAIN
 depends on ADK_TARGET_TOOLCHAIN
 config ADK_TOOLCHAIN_ONLY
 config ADK_TOOLCHAIN_ONLY
-	boolean "Only build toolchain and selected packages"
+	bool "Only build toolchain and selected packages"
 
 
 config ADK_TOOLCHAIN_ARCHIVE
 config ADK_TOOLCHAIN_ARCHIVE
-	boolean "Build a complete system usable f.e. via chroot"
+	bool "Build a complete system usable f.e. via chroot"
 
 
 endchoice
 endchoice
 
 

+ 0 - 2
target/config/Config.in.toolchain

@@ -222,8 +222,6 @@ config ADK_DEBUG_STRIP
 
 
 config ADK_TARGET_USE_STATIC_LIBS
 config ADK_TARGET_USE_STATIC_LIBS
 	bool "Link applications statically by default"
 	bool "Link applications statically by default"
-	default n
-	default y if ADK_TARGET_UCLINUX
 	select BUSYBOX_STATIC
 	select BUSYBOX_STATIC
 	help
 	help
 	  Useful for debugging of dynamic linker problems. Be aware of the fact, that uClibc and glibc
 	  Useful for debugging of dynamic linker problems. Be aware of the fact, that uClibc and glibc