dropbear: Fix CVE-2020-36254

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

diff --git a/config/Config-images.in b/config/Config-images.in
index 07ef619e7088dd8161aea90a5661d581f12c8866..8548c7cd24742daad4fb1c64e58bad82590795c2 100644 (file)
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -14,10 +14,11 @@ menu "Target Images"
 
                choice
                        prompt "Compression"
-                       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_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
                        help
@@ -197,14 +198,12 @@ 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"
@@ -220,7 +219,6 @@ menu "Target Images"
        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.
 
@@ -231,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
@@ -260,12 +266,14 @@ menu "Target Images"
 
        config TARGET_KERNEL_PARTSIZE
                int "Kernel partition size (in MB)"
-               depends on GRUB_IMAGES
+               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 || TARGET_mvebu || TARGET_uml
+               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.