Convert CONFIG_SYS_MONITOR_LEN to Kconfig

[platform/kernel/u-boot.git] / cmd / blob.c

diff --git a/cmd/blob.c b/cmd/blob.c
index d3b6e45..e2efae7 100644 (file)
--- a/cmd/blob.c
+++ b/cmd/blob.c
@@ -6,10 +6,14 @@
 
 #include <common.h>
 #include <command.h>
-#include <environment.h>
 #include <malloc.h>
 #include <asm/byteorder.h>
 #include <linux/compiler.h>
+#if defined(CONFIG_ARCH_MX6) || defined(CONFIG_ARCH_MX7) || \
+       defined(CONFIG_ARCH_MX7ULP) || defined(CONFIG_ARCH_IMX8M)
+#include <fsl_sec.h>
+#include <asm/arch/clock.h>
+#endif
 
 /**
  * blob_decap() - Decapsulate the data as a blob
@@ -49,7 +53,8 @@ __weak int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len)
  * Returns zero on success, CMD_RET_USAGE in case of misuse and negative
  * on error.
  */
-static int do_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
+static int do_blob(struct cmd_tbl *cmdtp, int flag, int argc,
+                  char *const argv[])
 {
        ulong key_addr, src_addr, dst_addr, len;
        uint8_t *km_ptr, *src_ptr, *dst_ptr;
@@ -65,15 +70,26 @@ static int do_blob(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        else
                return CMD_RET_USAGE;
 
-       src_addr = simple_strtoul(argv[2], NULL, 16);
-       dst_addr = simple_strtoul(argv[3], NULL, 16);
-       len = simple_strtoul(argv[4], NULL, 16);
-       key_addr = simple_strtoul(argv[5], NULL, 16);
+       src_addr = hextoul(argv[2], NULL);
+       dst_addr = hextoul(argv[3], NULL);
+       len = hextoul(argv[4], NULL);
+       key_addr = hextoul(argv[5], NULL);
 
        km_ptr = (uint8_t *)(uintptr_t)key_addr;
        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) || \
+       defined(CONFIG_ARCH_MX7ULP) || defined(CONFIG_ARCH_IMX8M)
+
+       hab_caam_clock_enable(1);
+
+       u32 out_jr_size = sec_in32(CONFIG_SYS_FSL_JR0_ADDR +
+                                  FSL_CAAM_ORSR_JRa_OFFSET);
+       if (out_jr_size != FSL_CAAM_MAX_JR_SIZE)
+               sec_init();
+#endif
+
        if (enc)
                ret = blob_encap(km_ptr, src_ptr, dst_ptr, len);
        else