image: ext4: allow creation of a journaling filesystem

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

diff --git a/config/Config-images.in b/config/Config-images.in
index a744fc7317b44aa6661bdf58e077f370644d824d..636a868d593c3446fbd4804f8e51e5373e3486fa 100644 (file)
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -66,11 +66,56 @@ 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
+
+               choice
+                       prompt "Root filesystem block size""
+                       default TARGET_EXT4_BLOCKSIZE_4K
+                       depends TARGET_ROOTFS_EXT4FS
+                       help
+                         Allows you to change the block size of the root filesystem
+
+                       config TARGET_EXT4_BLOCKSIZE_4K
+                               bool "4k"
+
+                       config TARGET_EXT4_BLOCKSIZE_2K
+                               bool "2k"
+
+                       config TARGET_EXT4_BLOCKSIZE_1K
+                               bool "1k"
+               endchoice
+
+               config TARGET_EXT4_BLOCKSIZE
+                       int
+                       default 4096 if TARGET_EXT4_BLOCKSIZE_4K
+                       default 2048 if TARGET_EXT4_BLOCKSIZE_2K
+                       default 1024 if TARGET_EXT4_BLOCKSIZE_1K
+                       depends TARGET_ROOTFS_EXT4FS
+
+               config TARGET_EXT4_JOURNAL
+                       bool "Create a journaling filesystem"
+                       depends on TARGET_ROOTFS_EXT4FS
+                       default n
+                       help
+                         Create an ext4 filesystem with a journal
 
        config TARGET_ROOTFS_ISO
                bool "iso"
@@ -133,30 +178,95 @@ menu "Target Images"
                        prompt "journal size" if TARGET_ROOTFS_UBIFS
                        default ""
 
+       config GRUB_IMAGES
+               bool "Build GRUB images (Linux x86 or x86_64 host only)"
+               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
+
+       config GRUB_CONSOLE
+               bool "Use Console Terminal (in addition to Serial)"
+               depends on GRUB_IMAGES
+               default n if (TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501 || TARGET_x86_geos || TARGET_x86_alix2)
+               default y
+
+       config GRUB_SERIAL
+               string "Serial port device"
+               depends on GRUB_IMAGES
+               default "hvc0" if TARGET_x86_xen_domu
+               default "ttyS0" if ! TARGET_x86_xen_domu
+
+       config GRUB_BAUDRATE
+               int "Serial port baud rate"
+               depends on GRUB_IMAGES
+               default 19200 if TARGET_x86_generic_Soekris45xx || TARGET_x86_generic_Soekris48xx || TARGET_x86_net5501
+               default 38400 if TARGET_x86_alix2
+               default 115200 if TARGET_x86_geos || TARGET_x86_kvm_guest
+               default 38400
+
+       config GRUB_BOOTOPTS
+               string "Extra kernel boot options"
+               depends on GRUB_IMAGES
+               default "xencons=hvc" if TARGET_x86_xen_domu
+               help
+                 If you don't know, just leave it blank.
+
+       config GRUB_TIMEOUT
+               string "Seconds to wait before booting the default entry"
+               depends on GRUB_IMAGES
+               default "5"
+               help
+                 If you don't know, 5 seconds is a reasonable default.
+
+       config VDI_IMAGES
+               bool "Build VirtualBox image files (VDI)"
+               depends on TARGET_x86 || TARGET_x86_64
+               select GRUB_IMAGES
+               select TARGET_ROOTFS_EXT4FS
+               select PACKAGE_kmod-e1000
+
+       config VMDK_IMAGES
+               bool "Build VMware image files (VMDK)"
+               depends on TARGET_x86 || TARGET_x86_64
+               select GRUB_IMAGES
+               select TARGET_ROOTFS_EXT4FS
+               select PACKAGE_kmod-e1000
+
+       config TARGET_IMAGES_PAD
+               bool "Pad images to filesystem size (for JFFS2)"
+               depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+
+       config TARGET_IMAGES_GZIP
+               bool "GZip images"
+               depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS
+               default y
+
        comment "Image Options"
 
        source "target/linux/*/image/Config.in"
 
+       config TARGET_KERNEL_PARTSIZE
+               int "Kernel partition size (in MB)"
+               depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+               default 4
+
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
-               depends on X86_GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
+               depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
                default 48
                help
                  Allows you to change the root filesystem partition size
 
-       config TARGET_ROOTFS_MAXINODE
-               int "Maximum number of inodes in root filesystem"
-               depends on TARGET_ROOTFS_EXT4FS
-               default 6000
+       config TARGET_ROOTFS_PARTNAME
+               string "Root partition on target device"
+               depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
+               default "/dev/xvda2" if TARGET_x86_xen_domu
+               default "/dev/sda2" if ! TARGET_x86_xen_domu
                help
-                 Allows you to change the maximum number of inodes in the root filesystem
+                 The root partition on the final device.  If you don't know,
+                 you probably want the default (/dev/sda2).
 
-       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"