Merge tag 'u-boot-rockchip-20200531' of https://gitlab.denx.de/u-boot/custodians...

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

diff --git a/tools/rkspi.c b/tools/rkspi.c
index 800e235168ff5d041469c4c57bc0b5a7c44bc781..f2530f7bde34bddea3a1908e5b52d468fc970a74 100644 (file)
--- a/tools/rkspi.c
+++ b/tools/rkspi.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 rkspi format
  */
 
@@ -17,44 +16,27 @@ enum {
        RKSPI_SECT_LEN          = RK_BLK_SIZE * 4,
 };
 
-static char dummy_hdr[RK_IMAGE_HEADER_LEN];
-
-static int rkspi_verify_header(unsigned char *buf, int size,
-                              struct image_tool_params *params)
-{
-       return 0;
-}
-
-static void rkspi_print_header(const void *buf)
-{
-}
-
 static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
                             struct image_tool_params *params)
 {
        int sector;
        unsigned int size;
-       int ret;
 
        size = params->orig_file_size;
-       ret = rkcommon_set_header(buf, size, params);
-       debug("size %x\n", 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 + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
-              RK_SPL_HDR_SIZE);
+       rkcommon_set_header(buf, sbuf, ifd, params);
 
        /*
         * Spread the image out so we only use the first 2KB of each 4KB
         * region. This is a feature of the SPI format required by the Rockchip
         * boot ROM. Its rationale is unknown.
         */
+       if (params->vflag)
+               fprintf(stderr, "Spreading spi image from %u to %u\n",
+                       size, params->file_size);
+
        for (sector = size / RKSPI_SECT_LEN - 1; sector >= 0; sector--) {
-               printf("sector %u\n", sector);
+               debug("sector %u\n", sector);
                memmove(buf + sector * RKSPI_SECT_LEN * 2,
                        buf + sector * RKSPI_SECT_LEN,
                        RKSPI_SECT_LEN);
@@ -63,11 +45,6 @@ static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
        }
 }
 
-static int rkspi_extract_subimage(void *buf, struct image_tool_params *params)
-{
-       return 0;
-}
-
 static int rkspi_check_image_type(uint8_t type)
 {
        if (type == IH_TYPE_RKSPI)
@@ -76,21 +53,24 @@ static int rkspi_check_image_type(uint8_t type)
                return EXIT_FAILURE;
 }
 
-/* We pad the file out to a fixed size - this method returns that size */
+/*
+ * The SPI payload needs to make space for odd half-sector layout used in flash
+ * (i.e. only the first 2K of each 4K sector is used).
+ */
 static int rkspi_vrec_header(struct image_tool_params *params,
                             struct image_type_params *tparams)
 {
-       int pad_size;
-
-       pad_size = (rkcommon_get_spl_size(params) + 0x7ff) / 0x800 * 0x800;
-       params->orig_file_size = pad_size;
+       rkcommon_vrec_header(params, tparams);
 
-       /* We will double the image size due to the SPI format */
-       pad_size *= 2;
-       pad_size += RK_SPL_HDR_START;
-       debug("pad_size %x\n", pad_size);
+       /*
+        * Converting to the SPI format (i.e. splitting each 4K page into two
+        * 2K subpages and then padding these 2K pages up to take a complete
+        * 4K sector again) which will double the image size.
+        */
+       params->file_size = ROUND(params->file_size, RKSPI_SECT_LEN) << 1;
 
-       return pad_size - params->file_size;
+       /* Ignoring pad len, since we are using our own copy_image() */
+       return 0;
 }
 
 /*
@@ -99,13 +79,13 @@ static int rkspi_vrec_header(struct image_tool_params *params,
 U_BOOT_IMAGE_TYPE(
        rkspi,
        "Rockchip SPI Boot Image support",
-       RK_IMAGE_HEADER_LEN,
-       dummy_hdr,
+       0,
+       NULL,
        rkcommon_check_params,
-       rkspi_verify_header,
-       rkspi_print_header,
+       rkcommon_verify_header,
+       rkcommon_print_header,
        rkspi_set_header,
-       rkspi_extract_subimage,
+       NULL,
        rkspi_check_image_type,
        NULL,
        rkspi_vrec_header