Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / tools / rkimage.c

diff --git a/tools/rkimage.c b/tools/rkimage.c
index ef31cb69444ec1573418769a84f94cd4e1d5917b..a0a3185370b89590bcb3b67c2011e868f132c070 100644 (file)
--- a/tools/rkimage.c
+++ b/tools/rkimage.c
@@ -1,9 +1,8 @@
+// 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
  */
 
@@ -13,26 +12,14 @@
 
 static uint32_t header;
 
-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)
@@ -52,10 +39,10 @@ U_BOOT_IMAGE_TYPE(
        4,
        &header,
        rkcommon_check_params,
-       rkimage_verify_header,
-       rkimage_print_header,
+       NULL,
+       NULL,
        rkimage_set_header,
-       rkimage_extract_subimage,
+       NULL,
        rkimage_check_image_type,
        NULL,
        NULL