X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tools%2Frkimage.c;h=a0a3185370b89590bcb3b67c2011e868f132c070;hb=582d97b6d37ed1bfce575c32d3847a42fc633b8e;hp=7b292f4235d1f43216c933cc5260b615bb73fbb0;hpb=850f788709cef8f7d53d571aec3bfb73b14c5531;p=u-boot

diff --git a/tools/rkimage.c b/tools/rkimage.c
index 7b292f4235..a0a3185370 100644
--- a/tools/rkimage.c
+++ b/tools/rkimage.c
@@ -1,41 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (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 rkimage format
  */
 
 #include "imagetool.h"
 #include <image.h>
+#include "rkcommon.h"
 
 static uint32_t header;
 
-static int rkimage_check_params(struct image_tool_params *params)
-{
-	return 0;
-}
-
-static int rkimage_verify_header(unsigned char *buf, int size,
-				 struct image_tool_params *params)
-{
-	return 0;
-}
-
-static void rkimage_print_header(const void *buf)
-{
-}
-
 static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd,
 			       struct image_tool_params *params)
 {
-	memcpy(buf, "RK32", 4);
-}
+	memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
+	       RK_SPL_HDR_SIZE);
 
-static int rkimage_extract_subimage(void *buf, struct image_tool_params *params)
-{
-	return 0;
+	if (rkcommon_need_rc4_spl(params))
+		rkcommon_rc4_encode_spl(buf, 4, params->file_size);
 }
 
 static int rkimage_check_image_type(uint8_t type)
@@ -54,11 +38,11 @@ U_BOOT_IMAGE_TYPE(
 	"Rockchip Boot Image support",
 	4,
 	&header,
-	rkimage_check_params,
-	rkimage_verify_header,
-	rkimage_print_header,
+	rkcommon_check_params,
+	NULL,
+	NULL,
 	rkimage_set_header,
-	rkimage_extract_subimage,
+	NULL,
 	rkimage_check_image_type,
 	NULL,
 	NULL