* Kconfig: cleanup

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

10 files changed, 32 insertions, 37 deletions

diff --git a/rules/Kconfig b/rules/Kconfig
index 8786c26f1..dca76f044 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -253,7 +253,6 @@ source "rules/gtk1210.in"
 source "rules/host-apache2.in"
 source "rules/host-checkinstall.in"
 source "rules/host-termcap.in"
-source "rules/host-umkimage.in"
 source "rules/host-zlib.in"
 # ---
 source "rules/konq-e.in"
diff --git a/rules/host-e2fsprogs.in b/rules/host-e2fsprogs.in
index 338f0e3b8..a2f454072 100644
--- a/rules/host-e2fsprogs.in
+++ b/rules/host-e2fsprogs.in
@@ -1,19 +1,19 @@
-config HOST_E2FSPROGS
+menuconfig HOST_E2FSPROGS
 	bool
-	prompt "e2fsprogs"
+	prompt "e2fsprogs               "
 	help
 	  Useful Hosttools for management of ext2 and ext3 filesystems
-	
+
 config HOST_E2FSPROGS_TUNE2FS
 	bool
-	prompt "Install tune2fs"
+	prompt "tune2fs"
 	depends on HOST_E2FSPROGS
 	help
 	  Tune2fs can read and set various aspects of a ext2/3 filesystem
 
 config HOST_E2FSPROGS_RESIZE2FS
 	bool
-	prompt "Install resize2fs"
+	prompt "resize2fs"
 	depends on HOST_E2FSPROGS
 	help
 	  Resize2fs can be used to resize an ext2/3 filesystem offline
diff --git a/rules/host-fakeroot.in b/rules/host-fakeroot.in
index d3c663cb3..067acf78c 100644
--- a/rules/host-fakeroot.in
+++ b/rules/host-fakeroot.in
@@ -3,8 +3,8 @@ config HOST_FAKEROOT
 	default y
 	help
 	  fakeroot lets you create archives with "real" owners and
-	  permissions, without being root. 
+	  permissions, without being root.
 
 	  If you want to create rootfs images with 'make image' you
-	  need this. 
+	  need this.
 
diff --git a/rules/host-ipkg-utils.in b/rules/host-ipkg-utils.in
index c6094a149..f95acb41a 100644
--- a/rules/host-ipkg-utils.in
+++ b/rules/host-ipkg-utils.in
@@ -3,5 +3,5 @@ config HOST_IPKG_UTILS
 	# no prompt, policy is that we always need it
 	default y if BUILD_USERLAND
 	help
-	  ipkg-utils let you build packages in the ipkg format. 
+	  ipkg-utils let you build packages in the ipkg format.
 
diff --git a/rules/host-mkelfImage.in b/rules/host-mkelfImage.in
index 3c7a14d98..5bbab55e1 100644
--- a/rules/host-mkelfImage.in
+++ b/rules/host-mkelfImage.in
@@ -1,15 +1,15 @@
 config HOST_MKELFIMAGE
 	bool
 	select HOST_FAKEROOT
-	prompt "mkelfImage: make etherboot image for LinuxBIOS"
+	prompt "mkelfimage"
 	help
 	  With mkelfImage you can create elf images from kernel
-	  files to be downloaded by Etherboot for LinuxBIOS. 
-	  Tagged images are data files, which contain the 
-	  necessary files for booting up (kernel+root for 
-	  linux, kernel+minifs for dos, ...) bundled together 
+	  files to be downloaded by Etherboot for LinuxBIOS.
+	  Tagged images are data files, which contain the
+	  necessary files for booting up (kernel+root for
+	  linux, kernel+minifs for dos, ...) bundled together
 	  with a special format.
- 	  
-	  These tagged images are downloaded and understood 
+
+	  These tagged images are downloaded and understood
 	  by Etherboot and can handle LinuxBIOS restrictions
-	  
+
diff --git a/rules/host-mknbi.in b/rules/host-mknbi.in
index 6914b1d03..eba6611c8 100644
--- a/rules/host-mknbi.in
+++ b/rules/host-mknbi.in
@@ -1,14 +1,14 @@
 config HOST_MKNBI
 	bool
 	select HOST_FAKEROOT
-	prompt "mknbi: make etherboot image"
+	prompt "mknbi"
 	help
-	  With mknbi you can create tagged images for Etherboot. 
-	  Tagged images are data files, which contain the 
-	  necessary files for booting up (kernel+root for 
-	  linux, kernel+minifs for dos, ...) bundled together 
+	  With mknbi you can create tagged images for Etherboot.
+	  Tagged images are data files, which contain the
+	  necessary files for booting up (kernel+root for
+	  linux, kernel+minifs for dos, ...) bundled together
 	  with a special format.
- 	  
-	  These tagged images are downloaded and understood 
+
+	  These tagged images are downloaded and understood
 	  by Etherboot and Netboot during the boot process.
 
diff --git a/rules/host-mtd.in b/rules/host-mtd.in
index 546da8591..f002361bd 100644
--- a/rules/host-mtd.in
+++ b/rules/host-mtd.in
@@ -1,5 +1,5 @@
-config HOST_MTD
-	bool "MTD Utilities"
+menuconfig HOST_MTD
+	bool "mtd utils               "
 	help
 	  FIXME: This item needs to be documented
 
diff --git a/rules/host-umkimage.in b/rules/host-umkimage.in
index edbcc17da..9976722ec 100644
--- a/rules/host-umkimage.in
+++ b/rules/host-umkimage.in
@@ -1,7 +1,6 @@
 config HOST_UMKIMAGE
 	bool
-	depends on BROKEN
-	prompt "HOST_UMKIMAGE [BROKEN]"
+	prompt "uboot mkimage"
 	help
 	  FIXME: This item needs to be documented
 
diff --git a/rules/host-util-linux.in b/rules/host-util-linux.in
index 64c80e24a..90bec611c 100644
--- a/rules/host-util-linux.in
+++ b/rules/host-util-linux.in
@@ -1,6 +1,6 @@
 menuconfig HOST_UTIL_LINUX
 	bool
-	prompt "util-linux"
+	prompt "util-linux              "
 
 config HOST_UTIL_LINUX_FDISK
 	bool
diff --git a/rules/hosttools.in b/rules/hosttools.in
index a877346db..77952d0c7 100644
--- a/rules/hosttools.in
+++ b/rules/hosttools.in
@@ -6,9 +6,10 @@ source "rules/host-genext2fs.in"
 source "rules/host-e2fsprogs.in"
 source "rules/host-mtd.in"
 
-comment "------------------------------"
-comment "Packaging Tools               "
-comment "------------------------------"
+#comment "------------------------------"
+#comment "Packaging Tools               "
+#comment "------------------------------"
+# No header - all packaging tools have no prompt
 
 source "rules/host-fakeroot.in"
 source "rules/host-ipkg.in"
@@ -21,11 +22,7 @@ comment "------------------------------"
 source "rules/host-module-init-tools.in"
 source "rules/host-modutils.in"
 source "rules/host-util-linux.in"
-
-config HOST_UMKIMAGE
-	bool
-	prompt "mkimage: U-Boot kernel image creation"
-
+source "rules/host-umkimage.in"
 source "rules/host-mknbi.in"
 source "rules/host-mkelfImage.in"