[U-Boot] [PATCH v5 14/41] rockchip: Add support for the SD image

[Simon Glass <sjg@chromium.org>]

The Rockchip boot ROM requires a particular file format. It consists of
64KB of zeroes, a 512-byte header encoded with RC4, and then some executable
code.

Add support to mkimage so that an SPL image (u-boot-spl-dtb.bin) can be
converted to this format.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None

 common/image.c  |   1 +
 include/image.h |   3 +-
 tools/Makefile  |   2 +-
 tools/rksd.c    | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 tools/rksd.c

diff --git a/common/image.c b/common/image.c
index cf2806f..2cdc728 100644
--- a/common/image.c
+++ b/common/image.c
@@ -156,6 +156,7 @@ static const table_entry_t uimage_type[] = {
 	{	IH_TYPE_X86_SETUP,  "x86_setup",  "x86 setup.bin",    },
 	{	IH_TYPE_LPC32XXIMAGE, "lpc32xximage",  "LPC32XX Boot Image", },
 	{	IH_TYPE_RKIMAGE,    "rkimage",    "Rockchip Boot Image" },
+	{	IH_TYPE_RKSD,       "rksd",       "Rockchip SD Boot Image" },
 	{	-1,		    "",		  "",			},
 };
 
diff --git a/include/image.h b/include/image.h
index 2daa74a..ea16205 100644
--- a/include/image.h
+++ b/include/image.h
@@ -246,8 +246,9 @@ struct lmb;
 #define IH_TYPE_LPC32XXIMAGE	21	/* x86 setup.bin Image		*/
 #define IH_TYPE_LOADABLE	22	/* A list of typeless images	*/
 #define IH_TYPE_RKIMAGE		23	/* Rockchip Boot Image		*/
+#define IH_TYPE_RKSD		24	/* Rockchip SD card		*/
 
-#define IH_TYPE_COUNT		24	/* Number of image types */
+#define IH_TYPE_COUNT		25	/* Number of image types */
 
 /*
  * Compression Types
diff --git a/tools/Makefile b/tools/Makefile
index 267f55c..9082bda 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -64,7 +64,7 @@ RSA_OBJS-$(CONFIG_FIT_SIGNATURE) := $(addprefix lib/rsa/, \
 					rsa-sign.o rsa-verify.o rsa-checksum.o \
 					rsa-mod-exp.o)
 
-ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o
+ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o
 
 # common objs for dumpimage and mkimage
 dumpimage-mkimage-objs := aisimage.o \
diff --git a/tools/rksd.c b/tools/rksd.c
new file mode 100644
index 0000000..2efcd68
--- /dev/null
+++ b/tools/rksd.c
@@ -0,0 +1,102 @@
+/*
+ * (C) Copyright 2015 Google,  Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ *
+ * See README.rockchip for details of the rksd format
+ */
+
+#include "imagetool.h"
+#include <image.h>
+#include <rc4.h>
+#include "mkimage.h"
+#include "rkcommon.h"
+
+enum {
+	RKSD_HEADER0_START	= 64 * RK_BLK_SIZE,
+	RKSD_SPL_HDR_START	= RKSD_HEADER0_START +
+					RK_CODE1_OFFSET * RK_BLK_SIZE,
+	RKSD_SPL_START		= RKSD_SPL_HDR_START + 4,
+	RKSD_HEADER_LEN		= RKSD_SPL_START,
+};
+
+static char dummy_hdr[RKSD_HEADER_LEN];
+
+static int rksd_check_params(struct image_tool_params *params)
+{
+	return 0;
+}
+
+static int rksd_verify_header(unsigned char *buf,  int size,
+				 struct image_tool_params *params)
+{
+	return 0;
+}
+
+static void rksd_print_header(const void *buf)
+{
+}
+
+static void rksd_set_header(void *buf,  struct stat *sbuf,  int ifd,
+			       struct image_tool_params *params)
+{
+	unsigned int size;
+	int ret;
+
+	/* Zero the whole header. The first 32KB is empty */
+	memset(buf,  '\0',  RKSD_HEADER0_START);
+
+	size = params->file_size - RKSD_SPL_HDR_START;
+	ret = rkcommon_set_header(buf + RKSD_HEADER0_START, size);
+	if (ret) {
+		/* TODO(sjg at chromium.org): This method should return an error */
+		printf("Warning: SPL image is too large (size %#x) and will not boot\n",
+		       size);
+	}
+
+	memcpy(buf + RKSD_SPL_HDR_START, "RK32", 4);
+}
+
+static int rksd_extract_subimage(void *buf,  struct image_tool_params *params)
+{
+	return 0;
+}
+
+static int rksd_check_image_type(uint8_t type)
+{
+	if (type == IH_TYPE_RKSD)
+		return EXIT_SUCCESS;
+	else
+		return EXIT_FAILURE;
+}
+
+/* We pad the file out to a fixed size - this method returns that size */
+static int rksd_vrec_header(struct image_tool_params *params,
+			    struct image_type_params *tparams)
+{
+	int pad_size;
+
+	pad_size = RKSD_SPL_HDR_START + RK_MAX_CODE1_SIZE;
+	debug("pad_size %x\n", pad_size);
+
+	return pad_size - params->file_size;
+}
+
+/*
+ * rk_sd parameters
+ */
+U_BOOT_IMAGE_TYPE(
+	rksd,
+	"Rockchip SD Boot Image support",
+	RKSD_HEADER_LEN,
+	dummy_hdr,
+	rksd_check_params,
+	rksd_verify_header,
+	rksd_print_header,
+	rksd_set_header,
+	rksd_extract_subimage,
+	rksd_check_image_type,
+	NULL,
+	rksd_vrec_header
+);
-- 
2.5.0.457.gab17608