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

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

diff --git a/tools/rksd.c b/tools/rksd.c
index 39f5c75e69ffd0a12dbdec503512ecd5dd46f5e0..c56153d2ca607dddbeb9a5a8b6593b70b6717068 100644 (file)
--- a/tools/rksd.c
+++ b/tools/rksd.c
@@ -13,49 +13,25 @@
 #include "mkimage.h"
 #include "rkcommon.h"
 
-enum {
-       RKSD_SPL_HDR_START      = RK_INIT_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)
+                           struct image_tool_params *params)
 {
        unsigned int size;
        int ret;
 
-       size = params->file_size - RKSD_SPL_HDR_START;
-       ret = rkcommon_set_header(buf, 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 (and not towards the
+        * header).
+        */
+       size = params->file_size - RK_SPL_HDR_START;
+       ret = rkcommon_set_header(buf, size, params);
        if (ret) {
                /* TODO([email protected]): This method should return an error */
-               printf("Warning: SPL image is too large (size %#x) and will not boot\n",
-                      size);
+               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)
@@ -66,16 +42,14 @@ 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;
+       /*
+        * 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);
 }
 
 /*
@@ -84,13 +58,13 @@ static int rksd_vrec_header(struct image_tool_params *params,
 U_BOOT_IMAGE_TYPE(
        rksd,
        "Rockchip SD Boot Image support",
-       RKSD_HEADER_LEN,
-       dummy_hdr,
-       rksd_check_params,
-       rksd_verify_header,
-       rksd_print_header,
+       0,
+       NULL,
+       rkcommon_check_params,
+       rkcommon_verify_header,
+       rkcommon_print_header,
        rksd_set_header,
-       rksd_extract_subimage,
+       NULL,
        rksd_check_image_type,
        NULL,
        rksd_vrec_header