From 5d797db35da7fa3f7971df8811b6a1e800786ced Mon Sep 17 00:00:00 2001
From: Franck LENORMAND <franck.lenormand@nxp.com>
Date: Wed, 2 May 2018 12:01:56 +0200
Subject: [PATCH] MLK-18043 4/4: imx7ulp: Enable support for cmd blob

Signed-off-by: Franck LENORMAND <franck.lenormand@nxp.com>
(cherry picked from commit 03cb71cd22ff6ab1e2005a4bcb183c65f49b6e4e)
---
 cmd/Kconfig | 4 ++--
 cmd/blob.c  | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 1147913ea1..2074ac5fe2 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1297,8 +1297,8 @@ config CMD_AES
 
 config CMD_BLOB
 	bool "Enable the 'blob' command"
-	depends on !MX6ULL && !MX6SLL && !MX6SL && !IMX8M && !MX7ULP
-	select SECURE_BOOT if ARCH_MX6 || ARCH_MX7
+	depends on !MX6ULL && !MX6SLL && !MX6SL && !IMX8M
+	select SECURE_BOOT if ARCH_MX6 || ARCH_MX7 || ARCH_MX7ULP
 	help
 	  This is used with the Freescale secure boot mechanism.
 
diff --git a/cmd/blob.c b/cmd/blob.c
index 8d96fd687d..aea1d36d31 100644
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -11,7 +11,8 @@
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
-#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7)
+#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) || \
+	defined(CONFIG_ARCH_MX7ULP)
 #include <fsl_sec.h>
 #include <asm/arch/clock.h>
 #endif
@@ -81,7 +82,8 @@ static int do_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 	src_ptr = (uint8_t *)(uintptr_t)src_addr;
 	dst_ptr = (uint8_t *)(uintptr_t)dst_addr;
 
-#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7)
+#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) || \
+	defined(CONFIG_ARCH_MX7ULP)
 
 	hab_caam_clock_enable(1);