X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=tools%2Frkimage.c;h=9880b1569f165a3709c7de9fd48d1dd5dcb1b93e;hb=6608cf0fbee3f70bb90f12e235fdb73ef54b1f4d;hp=f9fdcfa712f00496a88404a0181f783b158859fa;hpb=9cddb4fe0266484aab9babdd2ebe650021644ea9;p=u-boot

diff --git a/tools/rkimage.c b/tools/rkimage.c
index f9fdcfa712..9880b1569f 100644
--- a/tools/rkimage.c
+++ b/tools/rkimage.c
@@ -13,31 +13,14 @@
 
 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 + 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)
@@ -56,11 +39,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