Merge branch '2020-06-03-misc-bugfixes'

[oweals/u-boot.git] / tools / rksd.c

diff --git a/tools/rksd.c b/tools/rksd.c
index a8dbe9875094a81238d6ced076b661709981477e..7d46a1b07b3a96895ddcd5e6a661e2ab54e6a3af 100644 (file)
--- a/tools/rksd.c
+++ b/tools/rksd.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 rksd format
  */
 
@@ -13,51 +12,6 @@
 #include "mkimage.h"
 #include "rkcommon.h"
 
-enum {
-       RKSD_SPL_HDR_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;
-
-       size = params->file_size - RKSD_SPL_HDR_START;
-       ret = rkcommon_set_header(buf, size);
-       if (ret) {
-               /* TODO(sjg@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)
@@ -66,32 +20,20 @@ static int rksd_check_image_type(uint8_t type)
                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,
+       0,
+       NULL,
+       rkcommon_check_params,
+       rkcommon_verify_header,
+       rkcommon_print_header,
+       rkcommon_set_header,
+       NULL,
        rksd_check_image_type,
        NULL,
-       rksd_vrec_header
+       rkcommon_vrec_header
 );