Merge git://git.denx.de/u-boot-sunxi

[people/ms/u-boot.git] / tools / rksd.c

diff --git a/tools/rksd.c b/tools/rksd.c
index 8627b6d31b8f6e4aa3c1f63574050118a22b2c5a..c56153d2ca607dddbeb9a5a8b6593b70b6717068 100644 (file)
--- a/tools/rksd.c
+++ b/tools/rksd.c
@@ -13,29 +13,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 +34,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)
@@ -63,10 +46,10 @@ static int rksd_vrec_header(struct image_tool_params *params,
                            struct image_type_params *tparams)
 {
        /*
-        * Pad to the RK_BLK_SIZE (512 bytes) to be consistent with init_size
-        * being encoded in RK_BLK_SIZE units in header0 (see rkcommon.c).
+        * 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_BLK_SIZE);
+       return rkcommon_vrec_header(params, tparams, RK_INIT_SIZE_ALIGN);
 }
 
 /*
@@ -78,10 +61,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