odhcpd: update to latest git HEAD

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

diff --git a/config/Config-images.in b/config/Config-images.in
index 5b2ddd1bd4c453c83b9cc9424efbc672dcc3f91c..607659114e672e254b6a16a4cac5461f2ebcbe86 100644 (file)
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -17,6 +17,7 @@ menu "Target Images"
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx
+                       default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
                        default TARGET_INITRAMFS_COMPRESSION_NONE
                        depends on TARGET_ROOTFS_INITRAMFS
                        help
@@ -201,9 +202,13 @@ menu "Target Images"
                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
@@ -238,7 +243,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"
@@ -252,9 +257,8 @@ menu "Target Images"
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
-               depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 || TARGET_mvebu
-               default 2048 if TARGET_x86
-               default 256 if ! TARGET_x86
+               depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 || TARGET_mvebu || TARGET_uml
+               default 256
                help
                  Select the root filesystem partition size.