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 0252ef64251620c7635e26fa97ed42aea515dd27..8c4616f37caeb8edfcd61efaa460e071a1574e64 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_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
@@ -36,11 +37,9 @@ menu "Target Images"
                                bool "lzma"
 
                        config TARGET_INITRAMFS_COMPRESSION_LZO
-                               depends on !TARGET_ROOTFS_INITRAMFS_SEPARATE
                                bool "lzo"
 
                        config TARGET_INITRAMFS_COMPRESSION_LZ4
-                               depends on !TARGET_ROOTFS_INITRAMFS_SEPARATE
                                bool "lz4"
 
                        config TARGET_INITRAMFS_COMPRESSION_XZ
@@ -60,7 +59,6 @@ menu "Target Images"
                config TARGET_INITRAMFS_FORCE
                        bool "Force"
                        depends on TARGET_ROOTFS_INITRAMFS
-                       default n
                        help
                          Ignore the initramfs passed by the bootloader.
 
@@ -129,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.
 
@@ -234,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"
@@ -288,6 +284,7 @@ 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 MiB)"
@@ -313,7 +310,6 @@ menu "Target Images"
 
        config TARGET_ROOTFS_PERSIST_VAR
                bool "Make /var persistent"
-               default n
                help
                  Do not symlink /var to /tmp, so that its content will persist
                  across reboots. When enabled, /var/run will still be linked