image: ext4: move ext4 specific options into submenu

[openwrt/openwrt.git] / config / Config-images.in

diff --git a/config/Config-images.in b/config/Config-images.in
index ba9c6d8fa0d75ef874ae3b474764db4b7ae63706..49569006e90b92deed6298abfc54876e1719e592 100644 (file)
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -66,11 +66,25 @@ menu "Target Images"
 
        comment "Root filesystem images"
 
-       config TARGET_ROOTFS_EXT4FS
+       menuconfig TARGET_ROOTFS_EXT4FS
                bool "ext4"
                default y if USES_EXT4
                help
-                 Ext4 file system with some free space for uml images
+                 Build a ext4 root filesystem
+
+               config TARGET_ROOTFS_MAXINODE
+                       int "Maximum number of inodes in root filesystem"
+                       depends on TARGET_ROOTFS_EXT4FS
+                       default 6000
+                       help
+                         Allows you to change the maximum number of inodes in the root filesystem
+
+               config TARGET_ROOTFS_RESERVED_PCT
+                       int "Percentage of reserved blocks in root filesystem"
+                       depends on TARGET_ROOTFS_EXT4FS
+                       default 0
+                       help
+                         Allows you to change the percentage of reserved blocks in the root filesystem
 
        config TARGET_ROOTFS_ISO
                bool "iso"
@@ -135,7 +149,7 @@ menu "Target Images"
 
        config GRUB_IMAGES
                bool "Build GRUB images (Linux x86 or x86_64 host only)"
-               depends on TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc)
+               depends on TARGET_x86_64 || (TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc))
                depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
                select PACKAGE_grub2
                default y
@@ -176,14 +190,14 @@ menu "Target Images"
 
        config VDI_IMAGES
                bool "Build VirtualBox image files (VDI)"
-               depends on TARGET_x86
+               depends on TARGET_x86 || TARGET_x86_64
                select GRUB_IMAGES
                select TARGET_ROOTFS_EXT4FS
-               select PACKAGE_kmod-pcnet32
+               select PACKAGE_kmod-e1000
 
        config VMDK_IMAGES
                bool "Build VMware image files (VMDK)"
-               depends on TARGET_x86
+               depends on TARGET_x86 || TARGET_x86_64
                select GRUB_IMAGES
                select TARGET_ROOTFS_EXT4FS
                select PACKAGE_kmod-e1000
@@ -216,26 +230,12 @@ menu "Target Images"
        config TARGET_ROOTFS_PARTNAME
                string "Root partition on target device"
                depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
-               default "/dev/vda2" if TARGET_x86_kvm_guest
                default "/dev/xvda2" if TARGET_x86_xen_domu
-               default "/dev/sda2" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+               default "/dev/sda2" if ! TARGET_x86_xen_domu
                help
                  The root partition on the final device.  If you don't know,
                  you probably want the default (/dev/sda2).
 
-       config TARGET_ROOTFS_MAXINODE
-               int "Maximum number of inodes in root filesystem"
-               depends on TARGET_ROOTFS_EXT4FS
-               default 6000
-               help
-                 Allows you to change the maximum number of inodes in the root filesystem
-
-       config TARGET_ROOTFS_RESERVED_PCT
-               int "Percentage of reserved blocks in root filesystem"
-               depends on TARGET_ROOTFS_EXT4FS
-               default 0
-               help
-                 Allows you to change the percentage of reserved blocks in the root filesystem
 
        menuconfig TARGET_ROOTFS_INCLUDE_KERNEL
                bool "Include kernel in root filesystem"