MA-9376 [Android IMX] uboot: enable lock&unlock

Fix compile error for api change.

Porting below patches from v2015.o4:
    MA-7875 Enable CAAM for i.MX6
    MA-7875-1 Support fastboot lock&unlock in u-boot
    MA-7875-2 Support fastboot lock/unlock in i.MX6 platform
    MA-7875-3 Support fastboot lock/unlock in i.MX6UL
    MA-8425 fastboot: return OKAY in fastboot erase
    MA-8418 fix return value check for get_device_and_partition
    MA-8622 - [brillo] fix uboot compile warnings and code style warnings

Change-Id: I2370c3e5851cc1f92aaa93c200e6c079f7929af2
Signed-off-by: zhang sanshan <sanshan.zhang@nxp.com>

2 files changed, 109 insertions, 0 deletions

diff --git a/common/Makefile b/common/Makefile
index 86225f1564..47d5e15d36 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o
 obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 
+obj-$(CONFIG_CMD_FSL_CAAM_KB) += cmd_fsl_caam.o
 obj-$(CONFIG_CMD_BEDBUG) += bedbug.o
 obj-$(CONFIG_$(SPL_)OF_LIBFDT) += fdt_support.o
 
diff --git a/common/cmd_fsl_caam.c b/common/cmd_fsl_caam.c
new file mode 100644
index 0000000000..1cd7af7f29
--- /dev/null
+++ b/common/cmd_fsl_caam.c
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2012-2016 Freescale Semiconductor, Inc.
+ *
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+
+#include <common.h>
+#include <command.h>
+#include <fsl_caam.h>
+
+static int do_caam(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+
+	int ret, i;
+
+	if (argc < 2)
+	return CMD_RET_USAGE;
+
+	if (strcmp(argv[1], "genblob") == 0) {
+
+	if (argc != 5)
+	    return CMD_RET_USAGE;
+
+	void *data_addr;
+	void *blob_addr;
+	int size;
+
+	data_addr = (void *)simple_strtoul(argv[2], NULL, 16);
+	blob_addr = (void *)simple_strtoul(argv[3], NULL, 16);
+	size      = (void *)simple_strtoul(argv[4], NULL, 10);
+	if (size <= 48)
+		return CMD_RET_USAGE;
+
+	caam_open();
+	ret = caam_gen_blob((uint32_t)data_addr, (uint32_t)blob_addr, (uint32_t)size);
+
+	if(ret != SUCCESS){
+		printf("Error during blob decap operation: 0x%d\n",ret);
+		return 0;
+	}
+
+	/* Print the generated DEK blob */
+	printf("DEK blob is available at 0x%08X and equals:\n",(unsigned int)blob_addr);
+	for(i=0;i<size;i++)
+		printf("%02X ",((uint8_t *)blob_addr)[i]);
+	printf("\n\n");
+
+
+	return 1;
+
+	}
+
+	else if (strcmp(argv[1], "decap") == 0){
+
+	if (argc != 5)
+		return CMD_RET_USAGE;
+
+	void *blob_addr;
+	void *data_addr;
+	int size;
+
+	blob_addr = (void *)simple_strtoul(argv[2], NULL, 16);
+	data_addr = (void *)simple_strtoul(argv[3], NULL, 16);
+	size      = (void *)simple_strtoul(argv[4], NULL, 10);
+	if (size <= 48)
+		return CMD_RET_USAGE;
+
+	caam_open();
+	ret = caam_decap_blob((uint32_t)(data_addr), (uint32_t)(blob_addr), (uint32_t)size);
+	if(ret != SUCCESS)
+		printf("Error during blob decap operation: 0x%d\n",ret);
+	else {
+		printf("Success, blob decap at SM PAGE1 original data is:\n");
+		int i = 0;
+		for (i = 0; i < size; i++) {
+		printf("0x%x  ",*(unsigned char*)(data_addr+i));
+		if (i % 16 == 0)
+			printf("\n");
+		}
+		printf("\n");
+	}
+
+	return 1;
+	}
+
+	return CMD_RET_USAGE;
+}
+
+U_BOOT_CMD(
+	caam, 5, 1, do_caam,
+	"Freescale i.MX CAAM command",
+	"caam genblob data_addr blob_addr data_size\n \
+	caam decap blobaddr data_addr data_size\n \
+	\n "
+	);