diff --git a/Config.in b/Config.in
index 7683a8bc41..a7ef477b20 100644
--- a/Config.in
+++ b/Config.in
@@ -189,15 +189,6 @@ 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 04fa827c64..ddcf50bf32 100755
--- a/scripts/metadata.pl
+++ b/scripts/metadata.pl
@@ -172,7 +172,6 @@ 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 94c10bb34d..7f694e4c8b 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -63,9 +63,6 @@ config USES_CPIOGZ
 config USES_UBIFS
 	bool
 
-config USES_FIT
-	bool
-
 config PROFILE_KCONFIG
 	bool
 
diff --git a/target/linux/imx6/Makefile b/target/linux/imx6/Makefile
index ef4f08fa48..4a9bc8cb3c 100644
--- a/target/linux/imx6/Makefile
+++ b/target/linux/imx6/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=imx6
 BOARDNAME:=Freescale i.MX 6 Series
-FEATURES:=audio display gpio pcie usb usbgadget fit squashfs targz
+FEATURES:=audio display gpio pcie usb usbgadget squashfs targz
 CPU_TYPE:=cortex-a9
 CPU_SUBTYPE:=vfpv3
 MAINTAINER:=Luka Perkov <luka@openwrt.org>