build: fix for sourcing targets image config installed via feeds

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

diff --git a/config/Config-images.in b/config/Config-images.in
index 7d56d70908a945b572db159c93103bea524438f4..8c4616f37caeb8edfcd61efaa460e071a1574e64 100644 (file)
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -1,8 +1,6 @@
-# Copyright (C) 2006-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# SPDX-License-Identifier: GPL-2.0-only
 #
+# Copyright (C) 2006-2013 OpenWrt.org
 
 menu "Target Images"
 
@@ -19,6 +17,8 @@ menu "Target Images"
                        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_ZSTD if TARGET_ipq807x
+                       default TARGET_INITRAMFS_COMPRESSION_XZ if USES_SEPARATE_INITRAMFS
                        default TARGET_INITRAMFS_COMPRESSION_NONE
                        depends on TARGET_ROOTFS_INITRAMFS
                        help
@@ -44,6 +44,9 @@ menu "Target Images"
 
                        config TARGET_INITRAMFS_COMPRESSION_XZ
                                bool "xz"
+
+                       config TARGET_INITRAMFS_COMPRESSION_ZSTD
+                               bool "zstd"
                endchoice
 
                config EXTERNAL_CPIO
@@ -54,11 +57,19 @@ menu "Target Images"
                          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.
+                       bool "Force"
+                       depends on TARGET_ROOTFS_INITRAMFS
+                       help
+                         Ignore the initramfs passed by the bootloader.
+
+               config TARGET_ROOTFS_INITRAMFS_SEPARATE
+                       bool "separate ramdisk"
+                       depends on USES_SEPARATE_INITRAMFS && TARGET_ROOTFS_INITRAMFS && !TARGET_INITRAMFS_FORCE
+                       default y if USES_SEPARATE_INITRAMFS
+                       help
+                         Generate separate initrd.cpio instead of embedding it.
+                         This is useful for generating images with a dedicated
+                         ramdisk e.g. in U-Boot's uImage and uImage.FIT formats.
 
        comment "Root filesystem archives"
 
@@ -116,7 +127,6 @@ menu "Target Images"
                config TARGET_EXT4_JOURNAL
                        bool "Create a journaling filesystem"
                        depends on TARGET_ROOTFS_EXT4FS
-                       default n
                        help
                          Create an ext4 filesystem with a journal.
 
@@ -137,7 +147,7 @@ menu "Target Images"
                bool "squashfs"
                default y if USES_SQUASHFS
                help
-                 Build a squashfs-lzma root filesystem.
+                 Build a squashfs root filesystem.
 
                config TARGET_SQUASHFS_BLOCK_SIZE
                        int "Block size (in KiB)"
@@ -145,6 +155,9 @@ menu "Target Images"
                        default 64 if LOW_MEMORY_FOOTPRINT
                        default 1024 if (SMALL_FLASH && !LOW_MEMORY_FOOTPRINT)
                        default 256
+                       help
+                         Select squashfs block size, must be one of:
+                           4, 8, 16, 32, 64, 128, 256, 512, 1024
 
        menuconfig TARGET_ROOTFS_UBIFS
                bool "ubifs"
@@ -186,6 +199,7 @@ menu "Target Images"
                depends on TARGET_x86
                depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
                select PACKAGE_grub2
+               select PACKAGE_grub2-bios-setup
                default y
 
        config GRUB_EFI_IMAGES
@@ -194,6 +208,7 @@ menu "Target Images"
                depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
                select PACKAGE_grub2
                select PACKAGE_grub2-efi
+               select PACKAGE_grub2-bios-setup
                select PACKAGE_kmod-fs-vfat
                default y
 
@@ -216,7 +231,6 @@ menu "Target Images"
        config GRUB_FLOWCONTROL
                bool "Use RTE/CTS on serial console"
                depends on GRUB_SERIAL != ""
-               default n
 
        config GRUB_BOOTOPTS
                string "Extra kernel boot options"
@@ -256,6 +270,12 @@ menu "Target Images"
                depends on GRUB_IMAGES || GRUB_EFI_IMAGES
                select PACKAGE_kmod-e1000
 
+       config VHDX_IMAGES
+               bool "Build Hyper-V image files (VHDX)"
+               depends on TARGET_x86
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES
+               select PACKAGE_kmod-e1000
+
        config TARGET_IMAGES_GZIP
                bool "GZip images"
                depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armvirt || TARGET_malta
@@ -264,17 +284,18 @@ menu "Target Images"
        comment "Image Options"
 
        source "target/linux/*/image/Config.in"
+       source "target/linux/*/*/image/Config.in"
 
        config TARGET_KERNEL_PARTSIZE
-               int "Kernel partition size (in MB)"
+               int "Kernel partition size (in MiB)"
                depends on USES_BOOT_PART
                default 8 if TARGET_apm821xx_sata
                default 64 if TARGET_bcm27xx
                default 16
 
        config TARGET_ROOTFS_PARTSIZE
-               int "Root filesystem partition size (in MB)"
-               depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_sunxi || TARGET_uml
+               int "Root filesystem partition size (in MiB)"
+               depends on USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS
                default 104
                help
                  Select the root filesystem partition size.
@@ -287,4 +308,11 @@ menu "Target Images"
                  it will be mounted by PARTUUID which makes the kernel find the
                  appropriate disk automatically.
 
+       config TARGET_ROOTFS_PERSIST_VAR
+               bool "Make /var persistent"
+               help
+                 Do not symlink /var to /tmp, so that its content will persist
+                 across reboots. When enabled, /var/run will still be linked
+                 to /tmp/run.
+
 endmenu