projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rockchip: rk3399; move spl_board_init() into soc file
[oweals/u-boot.git]
/
tools
/
rksd.c
diff --git
a/tools/rksd.c
b/tools/rksd.c
index a2baa74d3121168503f65ea56ee3b3a9a0b16f68..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>
*
/*
* (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
*/
* See README.rockchip for details of the rksd format
*/
@@
-13,39
+12,25
@@
#include "mkimage.h"
#include "rkcommon.h"
#include "mkimage.h"
#include "rkcommon.h"
-static char dummy_hdr[RK_IMAGE_HEADER_LEN];
-
-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,
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;
{
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(sjg@chromium.org): This method should return an error */
size = params->file_size - RK_SPL_HDR_START;
ret = rkcommon_set_header(buf, size, params);
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);
+ 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);
-}
-
-static int rksd_extract_subimage(void *buf, struct image_tool_params *params)
-{
- return 0;
}
static int rksd_check_image_type(uint8_t type)
}
static int rksd_check_image_type(uint8_t type)
@@
-56,16
+41,14
@@
static int rksd_check_image_type(uint8_t type)
return EXIT_FAILURE;
}
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)
{
static int rksd_vrec_header(struct image_tool_params *params,
struct image_type_params *tparams)
{
- int pad_size;
-
- pad_size = RK_SPL_HDR_START + rkcommon_get_spl_size(params);
- 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);
}
/*
}
/*
@@
-74,13
+57,13
@@
static int rksd_vrec_header(struct image_tool_params *params,
U_BOOT_IMAGE_TYPE(
rksd,
"Rockchip SD Boot Image support",
U_BOOT_IMAGE_TYPE(
rksd,
"Rockchip SD Boot Image support",
-
RK_IMAGE_HEADER_LEN
,
-
dummy_hdr
,
+
0
,
+
NULL
,
rkcommon_check_params,
rkcommon_check_params,
- rk
sd
_verify_header,
- rk
sd
_print_header,
+ rk
common
_verify_header,
+ rk
common
_print_header,
rksd_set_header,
rksd_set_header,
-
rksd_extract_subimage
,
+
NULL
,
rksd_check_image_type,
NULL,
rksd_vrec_header
rksd_check_image_type,
NULL,
rksd_vrec_header