Separate filesystem and packages selection

Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>

3 files changed, 52 insertions, 18 deletions

diff --git a/Kconfig b/Kconfig
index 9692a90..3d28ddc 100644
--- a/Kconfig
+++ b/Kconfig
@@ -61,17 +61,18 @@ menu "Debugging system"
 source "kconfig/gdb.kconfig"
 endmenu
 
-menu "Root filesystem components and build options"
 config EMBTK_HAVE_ROOTFS
+	bool "Build root filesystem"
 	help
-	 If you want to build a root filesystem for your target, you must say
-	 yes here.
-	bool "Build a root filesystem"
+	 If you want to build a root filesystem for your target, and include
+	 some packages within it, you must say yes here.
+	 Select the root filesystem type in "Type of root filesystem to build".
+	 Select packages in "Packages to include in your root filesystem".
 
 if EMBTK_HAVE_ROOTFS
+source "kconfig/fs.kconfig"
 source "kconfig/packages.kconfig"
 endif
-endmenu
 
 menu "Embtoolkit build options"
 config EMBTK_NUMBER_BUILD_JOBS
diff --git a/kconfig/fs.kconfig b/kconfig/fs.kconfig
new file mode 100644
index 0000000..75b7b62
--- /dev/null
+++ b/kconfig/fs.kconfig
@@ -0,0 +1,42 @@
+################################################################################
+# GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# Copyright(C) 2009 GAYE Abdoulaye Walsimou. All rights reserved.
+# For Copyrright from linux kernel's build/configure system, see their source
+# code.
+#
+# This program is free software; you can distribute it and/or modify it
+# under the terms of the GNU General Public License
+# (Version 2 or later) published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
+################################################################################
+#
+# \file         fs.kconfig
+# \brief	fs.kconfig of Embtoolkit
+# \author       GAYE Abdoulaye Walsimou, <walsimou@walsimou.com>
+# \date         August 2009
+################################################################################
+
+menu "Type of root filesystem to build"
+
+#JFFS2 root filesystem image build
+config EMBTK_ROOTFS_HAVE_JFFS2
+	bool "Build a JFFS2 root filesystem image"
+	help
+	 Build a JFFS2 root filesystem image for your target
+
+config EMBTK_ROOTFS_HAVE_JFFS2_BLOCKSIZE
+	depends on EMBTK_ROOTFS_HAVE_JFFS2
+	help
+	 Erase block size to use in KB
+	string "Erase block size to use in KB"
+	default "512"
+
+endmenu
diff --git a/kconfig/packages.kconfig b/kconfig/packages.kconfig
index f307b30..a6d81ac 100644
--- a/kconfig/packages.kconfig
+++ b/kconfig/packages.kconfig
@@ -24,6 +24,8 @@
 # \date         May 2009
 ################################################################################
 
+menu "Packages to include in your root filesystem"
+
 #Busybox
 config EMBTK_ROOTFS_HAVE_BB
 	bool "Have Busybox in your root filesystem"
@@ -31,19 +33,6 @@ if EMBTK_ROOTFS_HAVE_BB
 source packages/busybox/busybox.kconfig
 endif
 
-#JFFS2 root filesystem image build
-config EMBTK_ROOTFS_HAVE_JFFS2
-	bool "Build a JFFS2 root filesystem image"
-	help
-	 Build a JFFS2 root filesystem image for your target
-
-config EMBTK_ROOTFS_HAVE_JFFS2_BLOCKSIZE
-	depends on EMBTK_ROOTFS_HAVE_JFFS2
-	help
-	 Erase block size to use in KB
-	string "Erase block size to use in KB"
-	default "128"
-
 #mtd-utils on target
 config EMBTK_ROOTFS_HAVE_MTDUTILS
 	bool "Have mtd-utils in your target root filesystem"
@@ -63,3 +52,5 @@ config EMBTK_ROOTFS_HAVE_MTDUTILS
 	   NAND Flash device
 	 These utilities are often used to write file system images to the Flash
 	 device on an embedded system.
+
+endmenu