tools: kwbimage: Set BOOT_FROM by default to SPI

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

diff --git a/tools/rksd.c b/tools/rksd.c
index c56153d2ca607dddbeb9a5a8b6593b70b6717068..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 <[email protected]>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * See README.rockchip for details of the rksd format
  */
 
@@ -13,27 +12,6 @@
 #include "mkimage.h"
 #include "rkcommon.h"
 
-static void rksd_set_header(void *buf,  struct stat *sbuf,  int ifd,
-                           struct image_tool_params *params)
-{
-       unsigned int size;
-       int ret;
-
-       /*
-        * 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);
-       }
-}
-
 static int rksd_check_image_type(uint8_t type)
 {
        if (type == IH_TYPE_RKSD)
@@ -42,16 +20,6 @@ static int rksd_check_image_type(uint8_t type)
                return EXIT_FAILURE;
 }
 
-static int rksd_vrec_header(struct image_tool_params *params,
-                           struct image_type_params *tparams)
-{
-       /*
-        * 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);
-}
-
 /*
  * rk_sd parameters
  */
@@ -63,9 +31,9 @@ U_BOOT_IMAGE_TYPE(
        rkcommon_check_params,
        rkcommon_verify_header,
        rkcommon_print_header,
-       rksd_set_header,
+       rkcommon_set_header,
        NULL,
        rksd_check_image_type,
        NULL,
-       rksd_vrec_header
+       rkcommon_vrec_header
 );