tools: kwbimage: Set BOOT_FROM by default to SPI

[J-u-boot.git] / tools / rkimage.c

diff --git a/tools/rkimage.c b/tools/rkimage.c
index 73634e316bc7ff1955707b7ab421b4adf4010eca..1c5540b1c3d1d1e73aaa88e71a7ba790950771eb 100644 (file)
--- a/tools/rkimage.c
+++ b/tools/rkimage.c
@@ -1,41 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015 Google, Inc
  * Written by Simon Glass <[email protected]>
  *
- * 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, CONFIG_ROCKCHIP_SPL_HDR, 4);
-}
+       memcpy(buf, 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, 0, params->file_size);
 }
 
 static int rkimage_check_image_type(uint8_t type)
@@ -52,13 +35,13 @@ static int rkimage_check_image_type(uint8_t type)
 U_BOOT_IMAGE_TYPE(
        rkimage,
        "Rockchip Boot Image support",
-       4,
+       0,
        &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