X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=config%2FConfig-images.in;h=8548c7cd24742daad4fb1c64e58bad82590795c2;hp=f81931e47fa680065077bc94c8651c3a98f31a4f;hb=df45ef54368d3e4f872928f47edc424d843b120d;hpb=d7b185128d8506d4844931094c9bc2d011ec006f diff --git a/config/Config-images.in b/config/Config-images.in index f81931e47f..8548c7cd24 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -14,7 +14,10 @@ menu "Target Images" choice prompt "Compression" + default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx + default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq + default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips default TARGET_INITRAMFS_COMPRESSION_NONE depends on TARGET_ROOTFS_INITRAMFS @@ -50,6 +53,13 @@ menu "Target Images" help Kernel uses specified external cpio as INITRAMFS_SOURCE. + config TARGET_INITRAMFS_FORCE + bool "Force" + depends on TARGET_ROOTFS_INITRAMFS + default n + help + Ignore the initramfs passed by the bootloader. + comment "Root filesystem archives" config TARGET_ROOTFS_CPIOGZ @@ -72,13 +82,6 @@ menu "Target Images" help Build an ext4 root filesystem. - config TARGET_EXT4_MAXINODE - int "Maximum number of inodes in root filesystem" - depends on TARGET_ROOTFS_EXT4FS - default 6000 - help - Select the maximum number of inodes in the root filesystem. - config TARGET_EXT4_RESERVED_PCT int "Percentage of reserved blocks in root filesystem" depends on TARGET_ROOTFS_EXT4FS @@ -147,6 +150,7 @@ menu "Target Images" int "Block size (in KiB)" depends on TARGET_ROOTFS_SQUASHFS default 64 if LOW_MEMORY_FOOTPRINT + default 1024 if (SMALL_FLASH && !LOW_MEMORY_FOOTPRINT) default 256 menuconfig TARGET_ROOTFS_UBIFS @@ -194,26 +198,27 @@ menu "Target Images" 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 + default "ttyS0" config GRUB_BAUDRATE int "Serial port baud rate" depends on GRUB_IMAGES default 38400 if TARGET_x86_generic - default 38400 if TARGET_x86_geode default 115200 + config GRUB_FLOWCONTROL + bool "Use RTE/CTS on serial console" + depends on GRUB_SERIAL != "" + default n + 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. @@ -224,16 +229,24 @@ menu "Target Images" help If you don't know, 5 seconds is a reasonable default. + config GRUB_TITLE + string "Title for the menu entry in GRUB" + depends on GRUB_IMAGES + default "OpenWrt" + help + This is the title of the GRUB menu entry. + If unspecified, it defaults to OpenWrt. + config VDI_IMAGES bool "Build VirtualBox image files (VDI)" - depends on TARGET_x86 || TARGET_x86_64 + depends on TARGET_x86 select GRUB_IMAGES select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 config VMDK_IMAGES bool "Build VMware image files (VMDK)" - depends on TARGET_x86 || TARGET_x86_64 + depends on TARGET_x86 select GRUB_IMAGES select TARGET_IMAGES_PAD select PACKAGE_kmod-e1000 @@ -244,7 +257,7 @@ menu "Target Images" config TARGET_IMAGES_GZIP bool "GZip images" - depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS + depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS || TARGET_x86 default y comment "Image Options" @@ -253,13 +266,15 @@ menu "Target Images" config TARGET_KERNEL_PARTSIZE int "Kernel partition size (in MB)" - depends on GRUB_IMAGES - default 4 + depends on GRUB_IMAGES || USES_BOOT_PART + default 8 if TARGET_apm821xx_sata + default 20 if TARGET_brcm2708 + default 16 config TARGET_ROOTFS_PARTSIZE int "Root filesystem partition size (in MB)" - depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 - default 48 + depends on GRUB_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_rb532 || TARGET_sunxi || TARGET_uml + default 256 help Select the root filesystem partition size. @@ -271,45 +286,4 @@ menu "Target Images" it will be mounted by PARTUUID which makes the kernel find the appropriate disk automatically. - - menuconfig TARGET_ROOTFS_INCLUDE_KERNEL - bool "Include kernel in root filesystem" - depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS - default n - help - Include the kernel image in the rootfs. Typically, the image is placed - below /boot. - - config TARGET_ROOTFS_INCLUDE_UIMAGE - bool "include uImage" if TARGET_ROOTFS_INCLUDE_KERNEL - default y - help - This option might not apply to all targets. Make sure - to check target/linux//image/Makefile to - see if this option will have any effect. - - config TARGET_ROOTFS_INCLUDE_ZIMAGE - bool "include zImage" if TARGET_ROOTFS_INCLUDE_KERNEL - default y - help - This option might not apply to all targets. Make sure - to check target/linux//image/Makefile to - see if this option will have any effect. - - config TARGET_ROOTFS_INCLUDE_FIT - bool "include FIT" if TARGET_ROOTFS_INCLUDE_KERNEL - default y - help - This option might not apply to all targets. Make sure - to check target/linux//image/Makefile to - see if this option will have any effect. - - config TARGET_ROOTFS_INCLUDE_DTB - bool "Include DTB in root filesystem" - depends on USES_DEVICETREE && (TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS) - default n - help - Include the device tree blob file(s) in the rootfs. Typically the DTBs - are placed below /boot. - endmenu