diff --git a/fs/iso9660/Config.in b/fs/iso9660/Config.in
index 3166b1a724..2dc0610d18 100644
--- a/fs/iso9660/Config.in
+++ b/fs/iso9660/Config.in
@@ -23,9 +23,11 @@ if BR2_TARGET_ROOTFS_ISO9660
 
 choice
 	prompt "Bootloader"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 
 config BR2_TARGET_ROOTFS_ISO9660_GRUB2
 	bool "grub2"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on BR2_TARGET_GRUB2 \
 		&& (BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI)
 	select BR2_TARGET_ROOTFS_ISO9660_BIOS_BOOTLOADER \
@@ -45,6 +47,7 @@ config BR2_TARGET_ROOTFS_ISO9660_GRUB2
 
 config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
 	bool "isolinux"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on BR2_TARGET_SYSLINUX_ISOLINUX
 	select BR2_TARGET_ROOTFS_ISO9660_BIOS_BOOTLOADER
 	help
@@ -54,6 +57,7 @@ config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX
 
 config BR2_TARGET_ROOTFS_ISO9660_BOTH
 	bool "both"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on BR2_TARGET_SYSLINUX_ISOLINUX
 	depends on BR2_TARGET_GRUB2 \
 		&& (BR2_TARGET_GRUB2_I386_EFI || BR2_TARGET_GRUB2_X86_64_EFI)
@@ -77,6 +81,7 @@ config BR2_TARGET_ROOTFS_ISO9660_EFI_BOOTLOADER
 
 config BR2_TARGET_ROOTFS_ISO9660_VOLUME_NAME
 	string "iso volume name"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	default "ISO9660"
 	help
 	  Set the Volume ID of the ISO image. xorriso accepts any text up to 32
@@ -88,6 +93,7 @@ config BR2_TARGET_ROOTFS_ISO9660_VOLUME_NAME
 
 config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX_BOOT_MENU
 	string "Isolinux configuration file"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on BR2_TARGET_ROOTFS_ISO9660_ISOLINUX || BR2_TARGET_ROOTFS_ISO9660_BOTH
 	default "fs/iso9660/isolinux.cfg"
 	help
@@ -100,6 +106,7 @@ config BR2_TARGET_ROOTFS_ISO9660_ISOLINUX_BOOT_MENU
 
 config BR2_TARGET_ROOTFS_ISO9660_GRUB2_BOOT_MENU
 	string "Grub2 configuration file"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on BR2_TARGET_ROOTFS_ISO9660_GRUB2 || BR2_TARGET_ROOTFS_ISO9660_BOTH
 	default "fs/iso9660/grub.cfg"
 	help
@@ -112,6 +119,7 @@ config BR2_TARGET_ROOTFS_ISO9660_GRUB2_BOOT_MENU
 
 config BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_BOOT_MENU
 	string "Grub2 configuration file (EFI)"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on (BR2_TARGET_ROOTFS_ISO9660_GRUB2 || BR2_TARGET_ROOTFS_ISO9660_BOTH) \
 		&& BR2_TARGET_ROOTFS_ISO9660_EFI_BOOTLOADER
 	default "fs/iso9660/efigrub.cfg"
@@ -137,6 +145,7 @@ config BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_BOOT_MENU
 
 config BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE
 	string "Grub2 identification file (EFI)"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on (BR2_TARGET_ROOTFS_ISO9660_GRUB2 || BR2_TARGET_ROOTFS_ISO9660_BOTH) \
 		&& BR2_TARGET_ROOTFS_ISO9660_EFI_BOOTLOADER
 	default "/boot/buildroot"
@@ -147,6 +156,7 @@ config BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_IDENT_FILE
 
 config BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_PARTITION_SIZE
 	string "Grub2 partition size (EFI)"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on (BR2_TARGET_ROOTFS_ISO9660_GRUB2 || BR2_TARGET_ROOTFS_ISO9660_BOTH) \
 		&& BR2_TARGET_ROOTFS_ISO9660_EFI_BOOTLOADER
 	default "3M"
@@ -160,6 +170,7 @@ config BR2_TARGET_ROOTFS_ISO9660_GRUB2_EFI_PARTITION_SIZE
 
 config BR2_TARGET_ROOTFS_ISO9660_INITRD
 	bool "Use initrd"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on !BR2_TARGET_ROOTFS_INITRAMFS
 	default y
 	select BR2_TARGET_ROOTFS_CPIO
@@ -172,6 +183,7 @@ config BR2_TARGET_ROOTFS_ISO9660_INITRD
 
 config BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION
 	bool "transparent compression"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on !BR2_TARGET_ROOTFS_ISO9660_INITRD
 	depends on !BR2_TARGET_ROOTFS_INITRAMFS
 	help
@@ -181,6 +193,7 @@ config BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION
 
 config BR2_TARGET_ROOTFS_ISO9660_HYBRID
 	bool "Build hybrid image"
+	depends on BR2_TARGET_ROOTFS_ISO9660
 	depends on BR2_TARGET_ROOTFS_ISO9660_ISOLINUX || BR2_TARGET_ROOTFS_ISO9660_BOTH
 	help
 	  Enable this option to build a hybrid image, which is an image
@@ -189,8 +202,9 @@ config BR2_TARGET_ROOTFS_ISO9660_HYBRID
 
 config BR2_TARGET_ROOTFS_ISO9660_HYBRID_APPEND_PARTITION
 	string "Append partition to hybrid image"
-	depends on BR2_TARGET_ROOTFS_ISO9660_BOTH \
-		&& BR2_TARGET_ROOTFS_ISO9660_HYBRID
+	depends on BR2_TARGET_ROOTFS_ISO9660
+	depends on BR2_TARGET_ROOTFS_ISO9660_BOTH
+	depends on BR2_TARGET_ROOTFS_ISO9660_HYBRID
 	default ""
 	help
 	  Enable this option to append a prepared filesystem image
@@ -204,9 +218,10 @@ config BR2_TARGET_ROOTFS_ISO9660_HYBRID_APPEND_PARTITION
 
 config BR2_TARGET_ROOTFS_ISO9660_HYBRID_APPEND_PARTITION_TYPE
 	string "Append partition type"
-	depends on BR2_TARGET_ROOTFS_ISO9660_BOTH \
-		&& BR2_TARGET_ROOTFS_ISO9660_HYBRID \
-		&& BR2_TARGET_ROOTFS_ISO9660_HYBRID_APPEND_PARTITION != ""
+	depends on BR2_TARGET_ROOTFS_ISO9660
+	depends on BR2_TARGET_ROOTFS_ISO9660_BOTH
+	depends on BR2_TARGET_ROOTFS_ISO9660_HYBRID
+	depends on BR2_TARGET_ROOTFS_ISO9660_HYBRID_APPEND_PARTITION != ""
 	default "0x0e"
 	help
 	  May be "FAT12", "FAT16", "Linux", or a hexadecimal number between 0x00 and