kernel: enable SRv6 support by enabling lwtunnel

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

diff --git a/config/Config-images.in b/config/Config-images.in
index ee686e8266e85247dea2371f19f3fa3531fa41c0..7d56d70908a945b572db159c93103bea524438f4 100644 (file)
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -15,7 +15,7 @@ menu "Target Images"
                choice
                        prompt "Compression"
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx
                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_ath79_mikrotik

                        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_LZMA if TARGET_lantiq
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips


@@ -120,13 +120,6 @@ menu "Target Images"
                        help
                          Create an ext4 filesystem with a journal.
 
                        help
                          Create an ext4 filesystem with a journal.
 

-       config TARGET_ROOTFS_ISO
-               bool "iso"
-               default n
-               depends on TARGET_x86_generic
-               help
-                 Create a bootable ISO image.
-

        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                depends on USES_JFFS2
        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
                depends on USES_JFFS2


@@ -191,23 +184,32 @@ menu "Target Images"
        config GRUB_IMAGES
                bool "Build GRUB images (Linux x86 or x86_64 host only)"
                depends on TARGET_x86
        config GRUB_IMAGES
                bool "Build GRUB images (Linux x86 or x86_64 host only)"
                depends on TARGET_x86

-               depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+               depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS

                select PACKAGE_grub2
                default y
 
                select PACKAGE_grub2
                default y
 

+       config GRUB_EFI_IMAGES
+               bool "Build GRUB EFI images (Linux x86 or x86_64 host only)"
+               depends on TARGET_x86
+               depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+               select PACKAGE_grub2
+               select PACKAGE_grub2-efi
+               select PACKAGE_kmod-fs-vfat
+               default y
+

        config GRUB_CONSOLE
                bool "Use Console Terminal (in addition to Serial)"
        config GRUB_CONSOLE
                bool "Use Console Terminal (in addition to Serial)"

-               depends on GRUB_IMAGES
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                default y
 
        config GRUB_SERIAL
                string "Serial port device"
                default y
 
        config GRUB_SERIAL
                string "Serial port device"

-               depends on GRUB_IMAGES
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                default "ttyS0"
 
        config GRUB_BAUDRATE
                int "Serial port baud rate"
                default "ttyS0"
 
        config GRUB_BAUDRATE
                int "Serial port baud rate"

-               depends on GRUB_IMAGES
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                default 38400 if TARGET_x86_generic
                default 115200
 
                default 38400 if TARGET_x86_generic
                default 115200
 


@@ -218,35 +220,40 @@ menu "Target Images"
 
        config GRUB_BOOTOPTS
                string "Extra kernel boot options"
 
        config GRUB_BOOTOPTS
                string "Extra kernel boot options"

-               depends on GRUB_IMAGES
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                help
                  If you don't know, just leave it blank.
 
        config GRUB_TIMEOUT
                string "Seconds to wait before booting the default entry"
                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
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                default "5"
                help
                  If you don't know, 5 seconds is a reasonable default.
 
        config GRUB_TITLE
                string "Title for the menu entry in GRUB"
                default "5"
                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
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                default "OpenWrt"
                help
                  This is the title of the GRUB menu entry.
                  If unspecified, it defaults to OpenWrt.
 
                default "OpenWrt"
                help
                  This is the title of the GRUB menu entry.
                  If unspecified, it defaults to OpenWrt.
 

+       config ISO_IMAGES
+               bool "Build LiveCD image (ISO)"
+               depends on TARGET_x86
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES
+

        config VDI_IMAGES
                bool "Build VirtualBox image files (VDI)"
                depends on TARGET_x86
        config VDI_IMAGES
                bool "Build VirtualBox image files (VDI)"
                depends on TARGET_x86

-               select GRUB_IMAGES
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                select PACKAGE_kmod-e1000
 
        config VMDK_IMAGES
                bool "Build VMware image files (VMDK)"
                depends on TARGET_x86
                select PACKAGE_kmod-e1000
 
        config VMDK_IMAGES
                bool "Build VMware image files (VMDK)"
                depends on TARGET_x86

-               select GRUB_IMAGES
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                select PACKAGE_kmod-e1000
 
        config TARGET_IMAGES_GZIP
                select PACKAGE_kmod-e1000
 
        config TARGET_IMAGES_GZIP


@@ -260,21 +267,21 @@ menu "Target Images"
 
        config TARGET_KERNEL_PARTSIZE
                int "Kernel partition size (in MB)"
 
        config TARGET_KERNEL_PARTSIZE
                int "Kernel partition size (in MB)"

-               depends on GRUB_IMAGES || USES_BOOT_PART
+               depends on USES_BOOT_PART

                default 8 if TARGET_apm821xx_sata
                default 8 if TARGET_apm821xx_sata

-               default 20 if TARGET_brcm2708
+               default 64 if TARGET_bcm27xx

                default 16
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
                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 128
+               depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_sunxi || TARGET_uml
+               default 104

                help
                  Select the root filesystem partition size.
 
        config TARGET_ROOTFS_PARTNAME
                string "Root partition on target device"
                help
                  Select the root filesystem partition size.
 
        config TARGET_ROOTFS_PARTNAME
                string "Root partition on target device"

-               depends on GRUB_IMAGES
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES

                help
                  Override the root partition on the final device. If left empty,
                  it will be mounted by PARTUUID which makes the kernel find the
                help
                  Override the root partition on the final device. If left empty,
                  it will be mounted by PARTUUID which makes the kernel find the