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

[u-boot] / tools / rksd.c

diff --git a/tools/rksd.c b/tools/rksd.c
index 6dafedf282218bd17f608b71242f9a10b71c8800..24411d863a0aa7ec161bf12d19d1d0374567f344 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,29 +12,17 @@
 #include "mkimage.h"
 #include "rkcommon.h"
 
-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)
+                           struct image_tool_params *params)
 {
        unsigned int size;
        int ret;
 
-       printf("params->file_size %d\n", params->file_size);
-       printf("params->orig_file_size %d\n", params->orig_file_size);
-
        /*
         * We need to calculate this using 'RK_SPL_HDR_START' and not using
         * 'tparams->header_size', as the additional byte inserted when
-        * 'is_boot0' is true counts towards the payload.
+        * 'is_boot0' is true counts towards the payload (and not towards the
+        * header).
         */
        size = params->file_size - RK_SPL_HDR_START;
        ret = rkcommon_set_header(buf, size, params);
@@ -46,11 +33,6 @@ static void rksd_set_header(void *buf,  struct stat *sbuf,  int ifd,
        }
 }
 
-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)
@@ -62,8 +44,11 @@ static int rksd_check_image_type(uint8_t type)
 static int rksd_vrec_header(struct image_tool_params *params,
                            struct image_type_params *tparams)
 {
-       /* We don't add any additional padding after the end of the image */
-       return rkcommon_vrec_header(params, tparams, 1);
+       /*
+        * Pad to a 2KB alignment, as required for init_size by the ROM
+        * (see https://lists.denx.de/pipermail/u-boot/2017-May/293268.html)
+        */
+       return rkcommon_vrec_header(params, tparams, RK_INIT_SIZE_ALIGN);
 }
 
 /*
@@ -75,10 +60,10 @@ U_BOOT_IMAGE_TYPE(
        0,
        NULL,
        rkcommon_check_params,
-       rksd_verify_header,
-       rksd_print_header,
+       rkcommon_verify_header,
+       rkcommon_print_header,
        rksd_set_header,
-       rksd_extract_subimage,
+       NULL,
        rksd_check_image_type,
        NULL,
        rksd_vrec_header