make rootfs configurable, add ext4 support

4 files changed, 107 insertions, 5 deletions

diff --git a/target/Config.in b/target/Config.in
index 0b7b95c13..a2756b5a2 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -212,10 +212,8 @@ config ADK_LINUX_X86_64_SHUTTLE
 	select ADK_KERNEL_BLK_DEV_MD if ADK_TARGET_ROOTFS_ARCHIVE
 	select ADK_KERNEL_MD_RAID0 if ADK_TARGET_ROOTFS_ARCHIVE
 	select ADK_KERNEL_MD_RAID1 if ADK_TARGET_ROOTFS_ARCHIVE
-	select ADK_KERNEL_XFS_FS if ADK_TARGET_ROOTFS_ARCHIVE
 	select ADK_KPACKAGE_KMOD_SKY2 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	select ADK_KPACKAGE_KMOD_SATA_AHCI if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
-	select ADK_KPACKAGE_KMOD_XFS_FS if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	select ADK_KPACKAGE_KMOD_BLK_DEV_MD if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	select ADK_KPACKAGE_KMOD_MD_RAID0 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
 	select ADK_KPACKAGE_KMOD_MD_RAID1 if ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
@@ -535,6 +533,80 @@ config ADK_TARGET_ROOTFS_ENCRYPTED
 
 endchoice
 
+choice
+prompt "Root filesystem type"
+	depends on ADK_TARGET_ROOTFS_INITRAMFS_PIGGYBACK
+	default ADK_TARGET_ROOT_XFS
+
+config ADK_TARGET_ROOT_XFS_MOD
+	boolean
+	prompt "XFS filesystem"
+	select ADK_KPACKAGE_KMOD_XFS_FS
+	select ADK_PACKAGE_XFSPROGS
+	help
+	  Select XFS filesystem kernel module and filesystem utilities.
+
+config ADK_TARGET_ROOT_EXT2_MOD
+	boolean
+	prompt "EXT2 filesystem"
+	select ADK_KPACKAGE_KMOD_EXT2_FS
+	select ADK_PACKAGE_E2FSPROGS
+	help
+	  Select EXT2 filesystem kernel module and filesystem utilities.
+
+config ADK_TARGET_ROOT_EXT3_MOD
+	boolean
+	prompt "EXT3 filesystem"
+	select ADK_KPACKAGE_KMOD_EXT3_FS
+	select ADK_PACKAGE_E2FSPROGS
+	help
+	  Select EXT3 filesystem kernel module and filesystem utilities.
+
+config ADK_TARGET_ROOT_EXT4_MOD
+	boolean
+	prompt "EXT4 filesystem"
+	select ADK_KPACKAGE_KMOD_EXT4_FS
+	select ADK_PACKAGE_E2FSPROGS
+	help
+	  Select EXT4 filesystem kernel module and filesystem utilities.
+
+endchoice
+
+choice
+prompt "Root filesystem type"
+	depends on ADK_TARGET_ROOTFS_ARCHIVE
+	default ADK_TARGET_ROOT_XFS
+
+config ADK_TARGET_ROOT_XFS
+	boolean
+	prompt "XFS filesystem"
+	select ADK_KERNEL_XFS_FS
+	help
+	  Compile XFS filesystem into kernel and use it as root filesystem.
+
+config ADK_TARGET_ROOT_EXT2
+	boolean
+	prompt "EXT2 filesystem"
+	select ADK_KERNEL_EXT2_FS
+	help
+	  Compile EXT2 filesystem into kernel and use it as root filesystem.
+
+config ADK_TARGET_ROOT_EXT3
+	boolean
+	prompt "EXT3 filesystem"
+	select ADK_KERNEL_EXT3_FS
+	help
+	  Compile EXT3 filesystem into kernel and use it as root filesystem.
+
+config ADK_TARGET_ROOT_EXT4
+	boolean
+	prompt "EXT4 filesystem"
+	select ADK_KERNEL_EXT4_FS
+	help
+	  Compile EXT4 filesystem into kernel and use it as root filesystem.
+
+endchoice
+
 #config ADK_SSP
 #	bool "Enable Stack Smashing Protection"
 #	default n
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index 7468ee55c..a9c2668ae 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -17,6 +17,10 @@ config ADK_KPACKAGE_KMOD_EXPORTFS
 	default n
 	help
 
+config ADK_KERNEL_EXT2_FS
+	boolean
+	default n
+
 config ADK_KPACKAGE_KMOD_EXT2_FS
 	prompt "kmod-fs-ext2...................... EXT2 filesystem support"
 	tristate
@@ -26,9 +30,14 @@ config ADK_KPACKAGE_KMOD_EXT2_FS
 	help
 	  Ext2 is a standard Linux file system for hard disks.
 
+config ADK_KERNEL_EXT3_FS
+	boolean
+	default n
+
 config ADK_KPACKAGE_KMOD_EXT3_FS
 	prompt "kmod-fs-ext3...................... EXT3 filesystem support"
 	tristate
+	depends on !ADK_KERNEL_EXT3_FS
 	default n
 	help
 	  This is the journalling version of the Second extended file system
@@ -54,6 +63,19 @@ config ADK_KPACKAGE_KMOD_EXT3_FS
 	  e2fsprogs version 1.20 or later in order to create ext3 journals
 	  (available at <http://sourceforge.net/projects/e2fsprogs/>).
 
+config ADK_KERNEL_EXT4_FS
+	boolean
+	select ADK_KERNEL_CRC16
+	default n
+
+config ADK_KPACKAGE_KMOD_EXT4_FS
+	prompt "kmod-fs-ext4...................... EXT4 filesystem support"
+	tristate
+	depends on !ADK_KERNEL_EXT4_FS
+	select ADK_KPACKAGE_KMOD_CRC16
+	default n
+	help
+
 config ADK_KPACKAGE_KMOD_HFSPLUS_FS
 	prompt "kmod-fs-hfsplus................... HFS+ filesystem support"
 	tristate
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 9b739f840..594dd8fec 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -92,7 +92,4 @@ config ADK_KERNEL_SUNRPC
 #	boolean
 #	default n
 
-config ADK_KERNEL_EXT2_FS
-	boolean
-	default n
 
diff --git a/target/linux/config/Config.in.lib b/target/linux/config/Config.in.lib
index 0f8847010..ca1092a8c 100644
--- a/target/linux/config/Config.in.lib
+++ b/target/linux/config/Config.in.lib
@@ -1,5 +1,9 @@
 menu "Library Routines"
 
+config ADK_KERNEL_CRC16
+	bool
+	default n
+
 config ADK_KERNEL_CRC32
 	bool
 	default n
@@ -14,6 +18,13 @@ config ADK_KPACKAGE_KMOD_CRC_ITU_T
 	  the kernel tree does. Such modules that use library CRC ITU-T V.41
 	  functions require M here.
 
+config ADK_KPACKAGE_KMOD_CRC16
+	prompt "kmod-crc16.......................... provide CRC16 library functions"
+	tristate
+        depends on ! ADK_KERNEL_CRC16
+	default n
+	help
+
 config ADK_KPACKAGE_KMOD_CRC32
 	prompt "kmod-crc32.......................... provide CRC32 library functions"
 	tristate