diff --git a/arch/arm/mach-imx/spl.c b/arch/arm/mach-imx/spl.c
index d43ddfee33..b06d2e2989 100644
--- a/arch/arm/mach-imx/spl.c
+++ b/arch/arm/mach-imx/spl.c
@@ -235,19 +235,44 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)
 
 	debug("image entry point: 0x%lX\n", spl_image->entry_point);
 
-	/* HAB looks for the CSF at the end of the authenticated data therefore,
-	 * we need to subtract the size of the CSF from the actual filesize */
-	offset = spl_image->size - CONFIG_CSF_SIZE;
-	if (!imx_hab_authenticate_image(spl_image->load_addr,
-					offset + IVT_SIZE + CSF_PAD_SIZE,
-					offset)) {
+	if (spl_image->flags & SPL_FIT_FOUND) {
 		image_entry();
 	} else {
+		/* HAB looks for the CSF at the end of the authenticated data therefore,
+		 * we need to subtract the size of the CSF from the actual filesize */
+		offset = spl_image->size - CONFIG_CSF_SIZE;
+		if (!imx_hab_authenticate_image(spl_image->load_addr,
+						offset + IVT_SIZE + CSF_PAD_SIZE,
+						offset)) {
+			image_entry();
+		} else {
+			puts("spl: ERROR:  image authentication unsuccessful\n");
+			hang();
+		}
+	}
+}
+
+ulong board_spl_fit_size_align(ulong size)
+{
+	/* HAB authenticate_image requests the IVT offset is aligned to 0x1000 */
+#define ALIGN_SIZE		0x1000
+
+	size = ALIGN(size, ALIGN_SIZE);
+	size += CONFIG_CSF_SIZE;
+
+	return size;
+}
+
+void board_spl_fit_post_load(ulong load_addr, size_t length)
+{
+	uint32_t offset = length - CONFIG_CSF_SIZE;
+	if (imx_hab_authenticate_image(load_addr,
+					offset + IVT_SIZE + CSF_PAD_SIZE,
+					offset)) {
 		puts("spl: ERROR:  image authentication unsuccessful\n");
 		hang();
 	}
 }
-
 #endif
 
 #if defined(CONFIG_MX6) && defined(CONFIG_SPL_OS_BOOT)
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index b705d030e7..9f3d4c96a4 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -15,6 +15,16 @@
 #define CONFIG_SYS_BOOTM_LEN	(64 << 20)
 #endif
 
+__weak void board_spl_fit_post_load(ulong load_addr, size_t length)
+{
+
+}
+
+__weak ulong board_spl_fit_size_align(ulong size)
+{
+	return size;
+}
+
 /**
  * spl_fit_get_image_name(): By using the matching configuration subnode,
  * retrieve the name of an image, specified by a property name and an index
@@ -341,6 +351,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
 	 */
 	size = fdt_totalsize(fit);
 	size = (size + 3) & ~3;
+	size = board_spl_fit_size_align(size);
 	base_offset = (size + 3) & ~3;
 
 	/*
@@ -364,8 +375,9 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
 			align_len) & ~align_len);
 	sectors = get_aligned_image_size(info, size, 0);
 	count = info->read(info, sector, sectors, fit);
-	debug("fit read sector %lx, sectors=%d, dst=%p, count=%lu\n",
-	      sector, sectors, fit, count);
+	debug("fit read sector %lx, sectors=%d, dst=%p, count=%lu, size=0x%lx\n",
+	      sector, sectors, fit, count, size);
+
 	if (count == 0)
 		return -EIO;
 
@@ -473,5 +485,11 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
 	if (spl_image->entry_point == FDT_ERROR || spl_image->entry_point == 0)
 		spl_image->entry_point = spl_image->load_addr;
 
+	spl_image->flags |= SPL_FIT_FOUND;
+
+#ifdef CONFIG_SECURE_BOOT
+	board_spl_fit_post_load((ulong)fit, size);
+#endif
+
 	return 0;
 }
diff --git a/include/spl.h b/include/spl.h
index c14448b8fc..dafae51784 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -77,6 +77,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
 			struct spl_load_info *info, ulong sector, void *fdt);
 
 #define SPL_COPY_PAYLOAD_ONLY	1
+#define SPL_FIT_FOUND		2
 
 /* SPL common functions */
 void preloader_console_init(void);