diff --git a/Config.in b/Config.in
index a7ef477b200091b13079253b52a352f784312e9d..7683a8bc417c0804af88169681ca94ec85cc3908 100644
--- a/Config.in
+++ b/Config.in
@@ -189,6 +189,15 @@ menu "Target Images"
 		  Include the device tree blob file(s) in the rootfs. Typically the DTBs
 		  are placed below /boot.
 
+	comment "Image Type"
+
+	config TARGET_IMAGE_FIT
+		bool "FIT image with kernel and DTB"
+		default y if USES_FIT
+		depends on USES_FIT
+		help
+		   Create a u-boot FIT image containing kernel and DTB
+
 endmenu
 
 menu "Global build settings"
diff --git a/scripts/metadata.pl b/scripts/metadata.pl
index ddcf50bf32a3b9a1e0ab4770b4a97443787e109e..04fa827c647626efc41b5245ce3190f1475e13e1 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -172,6 +172,7 @@ sub target_config_features(@) {
 		/targz/ and $ret .= "\tselect USES_TARGZ\n";
 		/cpiogz/ and $ret .= "\tselect USES_CPIOGZ\n";
 		/ubifs/ and $ret .= "\tselect USES_UBIFS\n";
+		/fit/ and $ret .= "\tselect USES_FIT\n";
 		/fpu/ and $ret .= "\tselect HAS_FPU\n";
 		/spe_fpu/ and $ret .= "\tselect HAS_SPE_FPU\n";
 		/ramdisk/ and $ret .= "\tselect USES_INITRAMFS\n";
diff --git a/target/Config.in b/target/Config.in
index 7f694e4c8badc436bc76d4d124322d9cecee9818..94c10bb34d73ea9a249c1ffc9534e926a3300018 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -63,6 +63,9 @@ config USES_CPIOGZ
 config USES_UBIFS
 	bool
 
+config USES_FIT
+	bool
+
 config PROFILE_KCONFIG
 	bool