build: set TARGET_ROOTFS_PARTSIZE to make combined image fit in 128MB

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

diff --git a/config/Config-images.in b/config/Config-images.in
index 8548c7cd24742daad4fb1c64e58bad82590795c2..4ee0273f635be5d19dd1d5495767294566e9a970 100644 (file)
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -241,23 +241,17 @@ menu "Target Images"
                bool "Build VirtualBox image files (VDI)"
                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
                select GRUB_IMAGES
-               select TARGET_IMAGES_PAD
                select PACKAGE_kmod-e1000
 
-       config TARGET_IMAGES_PAD
-               bool "Pad images to filesystem size (for JFFS2)"
-               depends on GRUB_IMAGES
-
        config TARGET_IMAGES_GZIP
                bool "GZip images"
-               depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS || TARGET_x86
+               depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armvirt || TARGET_malta
                default y
 
        comment "Image Options"
@@ -268,13 +262,13 @@ menu "Target Images"
                int "Kernel partition size (in MB)"
                depends on GRUB_IMAGES || USES_BOOT_PART
                default 8 if TARGET_apm821xx_sata
-               default 20 if TARGET_brcm2708
+               default 64 if TARGET_brcm2708
                default 16
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
                depends on GRUB_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_rb532 || TARGET_sunxi || TARGET_uml
-               default 256
+               default 104
                help
                  Select the root filesystem partition size.