improved BUILD_USERLAND

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-0.9-trunk@3707 33e552b5-05e3-0310-8538-816dae2090ed

8 files changed, 56 insertions, 29 deletions

diff --git a/rules/Kconfig b/rules/Kconfig
index 91befea71..9303cc1dd 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -37,7 +37,6 @@ source "rules/rootfs.in"
 endmenu
 
 menu "Core (Kernel, C-Library)    "
-depends on BUILD_USERLAND
 source "rules/kernel.in"
 source "rules/klibc.in"
 source "rules/libc.in"
@@ -45,6 +44,7 @@ source "rules/gcclibs.in"
 endmenu
 
 comment "----------------------------------"
+depends on BUILD_USERLAND
 
 menu "Shell & Console Tools       "
 depends on BUILD_USERLAND
diff --git a/rules/cfgsh.in b/rules/cfgsh.in
index 27b3ff076..7df48e93d 100644
--- a/rules/cfgsh.in
+++ b/rules/cfgsh.in
@@ -1,9 +1,7 @@
-menu "Config Shell        "
-
-config CFGSH
+menuconfig CFGSH
 	bool
 	depends on BROKEN
-	prompt "cfgsh"
+	prompt "cfgsh               "
 	default n
 	help
 	  cfgsh, the Configuration Shell utility, is a small utility 
@@ -21,7 +19,6 @@ config CFGSH
 	  program and configuration file that will implement the same 
 	  functionality in a manner more consistent with the embedded 
 	  system world.
-endmenu
 
 comment "cfgsh is broken, please send a patch"
 	depends on !BROKEN
diff --git a/rules/crosstool.in b/rules/crosstool.in
index 3ce173c61..4fb6d5890 100644
--- a/rules/crosstool.in
+++ b/rules/crosstool.in
@@ -20,57 +20,65 @@ config CROSSTOOL
 choice
 	prompt "version"
 		depends on CROSSTOOL
-	config CROSSTOOL_VERSION_0_32
-		bool
-		prompt "0.32"
+		default CROSSTOOL_VERSION_0_38
+
 	config CROSSTOOL_VERSION_0_38
 		bool
 		prompt "0.38"
+
+	config CROSSTOOL_VERSION_0_32
+		bool
+		prompt "0.32"
 endchoice
 	
 choice
 	prompt "GCC Version"
 		depends on CROSSTOOL
 
-	config GCC_2_95_3
+	config GCC_3_4_5
 		bool
-		prompt "2.95.3"
+		prompt "3.4.5"
 
-	config GCC_3_2_3
+	config GCC_3_4_4
 		bool
-		prompt "3.2.3"
+		prompt "3.4.4"
+	
+	config GCC_3_4_3
+		bool
+		prompt "3.4.3"
+	
+	config GCC_3_4_2
+		bool
+		prompt "3.4.2"
 
-	config GCC_3_3_2
+	config GCC_3_4_1
 		bool
-		prompt "3.3.2"
+		prompt "3.4.1"
 
-	config GCC_3_3_3
+	config GCC_3_4_0
 		bool
-		prompt "3.3.3"
+		prompt "3.4.0"
 
 	config GCC_3_3_6
 		bool
 		prompt "3.3.6"
 
-	config GCC_3_4_0
+	config GCC_3_3_3
 		bool
-		prompt "3.4.0"
+		prompt "3.3.3"
 
-	config GCC_3_4_1
+	config GCC_3_3_2
 		bool
-		prompt "3.4.1"
+		prompt "3.3.2"
 
-	config GCC_3_4_2
+	config GCC_3_2_3
 		bool
-		prompt "3.4.2"
+		prompt "3.2.3"
 
-	config GCC_3_4_3
+	config GCC_2_95_3
 		bool
-		prompt "3.4.3"
+		prompt "2.95.3"
 
-	config GCC_3_4_4
-		bool
-		prompt "3.4.4"
 endchoice
 
 config GCC_VERSION
@@ -84,6 +92,7 @@ config GCC_VERSION
 	default "3.4.2"		if GCC_3_4_2
 	default "3.4.3"		if GCC_3_4_3
 	default "3.4.4"		if GCC_3_4_4
+	default "3.4.5"		if GCC_3_4_5
 	
 
 config CROSSTOOL_GCCLANG_CC
diff --git a/rules/gcclibs.in b/rules/gcclibs.in
index 234901103..c4a1653aa 100644
--- a/rules/gcclibs.in
+++ b/rules/gcclibs.in
@@ -3,6 +3,7 @@
 #
 
 menu	"GCC Libraries       "
+	depends on BUILD_USERLAND
 
 config GCCLIBS_CXX
 	bool "libstdc++"
diff --git a/rules/glibc.in b/rules/glibc.in
index 0e495401a..18a335de4 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -1,12 +1,15 @@
 config GLIBC_DEBUG
 	bool "Don't strip debugging symbols"
+	depends on BUILD_USERLAND
 
 # ----------
 
 comment	"Install options"
+	depends on BUILD_USERLAND
 
 config GLIBC_INSTALL
 	bool
+	depends on BUILD_USERLAND
 	default y if !CROSSTOOL
 	default n if CROSSTOOL
 	prompt "Install glibc libraries on the target"
diff --git a/rules/kernel.in b/rules/kernel.in
index b99315091..375eb676d 100644
--- a/rules/kernel.in
+++ b/rules/kernel.in
@@ -14,6 +14,7 @@ config USE_EXTERNAL_KERNEL
 	bool
 	prompt "Use external kernel"
 	default n
+	depends on BUILD_USERLAND
 	help
 	  Say yes if you intend to use an external already configured 
 	  kernel tree. You want this if you, for example, are currently
@@ -32,6 +33,7 @@ config KERNEL_CONFIG
 	string
 	prompt "Path to kernel .config file"
 	depends on !USE_EXTERNAL_KERNEL
+	depends on BUILD_USERLAND
 	help
 	  Usually config files for the kernel live in $(PROJECTDIR), so
 	  add something like
@@ -191,12 +193,14 @@ endchoice
 config DONT_COMPILE_KERNEL
 	bool
 	prompt "Don't compile kernel"
+	depends on BUILD_USERLAND
 	default n
 
 choice
 	prompt "Kernel Image"
 	default KERNEL_IMAGE_BZ
 	depends on !DONT_COMPILE_KERNEL || KERNEL_INSTALL
+	depends on BUILD_USERLAND
 
 	config KERNEL_IMAGE_BZ
 		bool
@@ -220,12 +224,14 @@ endchoice
 
 config KERNEL_INSTALL
 	bool
+	depends on BUILD_USERLAND
 	prompt "Install kernel into /boot on target"
 	default n
 	select KERNEL_INSTALL_MODULES if !DONT_COMPILE_KERNEL
 
 config KERNEL_INSTALL_MODULES
 	bool
+	depends on BUILD_USERLAND
 	prompt "Install modules into /lib/modules on target"
 	default n 
 
@@ -234,11 +240,13 @@ config KERNEL_INSTALL_MODULES
 # ----------------------------------------------------------------------------
 
 comment ""
+	depends on BUILD_USERLAND
 
 config KERNEL_PATCH1_URL
 	prompt "Patch 1 URL"
 	string
 	depends on !USE_EXTERNAL_KERNEL
+	depends on BUILD_USERLAND
 	help
 	  Enter a URL to a diff/patch file or to a directory containing
 	  a patch tree for patcher here. 
@@ -246,6 +254,7 @@ config KERNEL_PATCH1_URL
 config KERNEL_PATCH1_NAME
 	prompt "Patch 1 Name"
 	depends on !USE_EXTERNAL_KERNEL
+	depends on BUILD_USERLAND
 	string
 
 comment ""
@@ -577,11 +586,15 @@ comment ""
 # ----------------------------------------------------------------------------
 
 comment "----------------------------------"
+depends on BUILD_USERLAND
 comment "Host Kernel (for simulation)"
+depends on BUILD_USERLAND
 comment "----------------------------------"
+depends on BUILD_USERLAND
 
 config KERNEL_HOST
 	bool
+	depends on BUILD_USERLAND
 	default N
 	prompt "build UML kernel for simulation"
 	help
@@ -619,8 +632,8 @@ endchoice
 
 choice
 	prompt "Root filesystem method for host"
+	depends on KERNEL_HOST
 		
-
 	config KERNEL_HOST_ROOT_HOSTFS
 		bool
 		prompt "hostfs"
@@ -643,6 +656,7 @@ config KERNEL_HOST_CONSOLE_STDSERIAL
 config KERNEL_HOST_CMDLINE
 	string
 	prompt "kernel command line for host kernel"
+	depends on KERNEL_HOST
 	help
 	  Add your custom kernel commandline for the user mode linux 
 	  kernel here. 
@@ -657,6 +671,7 @@ config KERNEL_HOST_CMDLINE
 # ----------------------------------------------------------------------------
 
 comment ""
+	depends on BUILD_USERLAND
 
 config KERNEL_HOST_PATCH1_URL
 	prompt "Patch 1 URL"
diff --git a/rules/klibc.in b/rules/klibc.in
index 2625023ee..cbd38812f 100644
--- a/rules/klibc.in
+++ b/rules/klibc.in
@@ -4,6 +4,7 @@
 
 ##############################################################################
 menu "klibc               "
+	depends on BUILD_USERLAND
 ##############################################################################
 
 config KLIBC
diff --git a/rules/target.in b/rules/target.in
index 8d0e3402f..6631bc346 100644
--- a/rules/target.in
+++ b/rules/target.in
@@ -356,6 +356,7 @@ config CROSSCHAIN_CHECK
 	string
 	prompt "Check for specific gcc version"
 	default "2.95.3"
+	depends on BUILD_USERLAND
 	help
 	  PTXdist calls your cross compiler with -dumpversion and
 	  compares the output with this string. This should help