target: Make TARGET_SERIAL independent of GRUB configuration

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

diff --git a/config/Config-images.in b/config/Config-images.in
index 0252ef64251620c7635e26fa97ed42aea515dd27..c2d7af7a80b105f0c5a6a92a2caf63a9541e3984 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_qualcommax
                        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.
 
@@ -207,11 +204,12 @@ menu "Target Images"
 
        config GRUB_EFI_IMAGES
                bool "Build GRUB EFI images (Linux x86 or x86_64 host only)"
-               depends on TARGET_x86
+               depends on TARGET_x86 || TARGET_armsr
                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_grub2 if TARGET_x86
+               select PACKAGE_grub2-efi if TARGET_x86
+               select PACKAGE_grub2-bios-setup if TARGET_x86
+               select PACKAGE_grub2-efi-arm if TARGET_armsr
                select PACKAGE_kmod-fs-vfat
                default y
 
@@ -220,11 +218,6 @@ menu "Target Images"
                depends on GRUB_IMAGES || GRUB_EFI_IMAGES
                default y
 
-       config GRUB_SERIAL
-               string "Serial port device"
-               depends on GRUB_IMAGES || GRUB_EFI_IMAGES
-               default "ttyS0"
-
        config GRUB_BAUDRATE
                int "Serial port baud rate"
                depends on GRUB_IMAGES || GRUB_EFI_IMAGES
@@ -233,8 +226,8 @@ menu "Target Images"
 
        config GRUB_FLOWCONTROL
                bool "Use RTE/CTS on serial console"
-               depends on GRUB_SERIAL != ""
-               default n
+               depends on GRUB_IMAGES || GRUB_EFI_IMAGES
+               depends on TARGET_SERIAL != ""
 
        config GRUB_BOOTOPTS
                string "Extra kernel boot options"
@@ -270,7 +263,7 @@ menu "Target Images"
 
        config VMDK_IMAGES
                bool "Build VMware image files (VMDK)"
-               depends on TARGET_x86
+               depends on TARGET_x86 || TARGET_armsr
                depends on GRUB_IMAGES || GRUB_EFI_IMAGES
                select PACKAGE_kmod-e1000
 
@@ -280,20 +273,27 @@ menu "Target Images"
                depends on GRUB_IMAGES || GRUB_EFI_IMAGES
                select PACKAGE_kmod-e1000
 
+       config TARGET_SERIAL
+               string "Serial port device"
+               depends on TARGET_x86 || TARGET_armsr
+               default "ttyS0"
+
        config TARGET_IMAGES_GZIP
                bool "GZip images"
-               depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armvirt || TARGET_malta
+               depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armsr || TARGET_malta
                default y
 
        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)"
                depends on USES_BOOT_PART
                default 8 if TARGET_apm821xx_sata
                default 64 if TARGET_bcm27xx
+               default 128 if TARGET_armsr
                default 16
 
        config TARGET_ROOTFS_PARTSIZE
@@ -313,7 +313,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