projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-stm32-20200424' of https://gitlab.denx.de/u-boot/custodians/u-boot-stm
[oweals/u-boot.git]
/
tools
/
rkimage.c
diff --git
a/tools/rkimage.c
b/tools/rkimage.c
index ef31cb69444ec1573418769a84f94cd4e1d5917b..1c5540b1c3d1d1e73aaa88e71a7ba790950771eb 100644
(file)
--- a/
tools/rkimage.c
+++ b/
tools/rkimage.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 rkimage format
*/
* See README.rockchip for details of the rkimage format
*/
@@
-13,26
+12,13
@@
static uint32_t header;
static uint32_t header;
-static int rkimage_verify_header(unsigned char *buf, int size,
- struct image_tool_params *params)
-{
- return 0;
-}
-
-static void rkimage_print_header(const void *buf)
-{
-}
-
static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd,
struct image_tool_params *params)
{
static void rkimage_set_header(void *buf, struct stat *sbuf, int ifd,
struct image_tool_params *params)
{
- memcpy(buf + RK_SPL_HDR_START, rkcommon_get_spl_hdr(params),
- RK_SPL_HDR_SIZE);
-}
+ memcpy(buf, rkcommon_get_spl_hdr(params), RK_SPL_HDR_SIZE);
-static int rkimage_extract_subimage(void *buf, struct image_tool_params *params)
-{
- return 0;
+ if (rkcommon_need_rc4_spl(params))
+ rkcommon_rc4_encode_spl(buf, 0, params->file_size);
}
static int rkimage_check_image_type(uint8_t type)
}
static int rkimage_check_image_type(uint8_t type)
@@
-49,13
+35,13
@@
static int rkimage_check_image_type(uint8_t type)
U_BOOT_IMAGE_TYPE(
rkimage,
"Rockchip Boot Image support",
U_BOOT_IMAGE_TYPE(
rkimage,
"Rockchip Boot Image support",
-
4
,
+
0
,
&header,
rkcommon_check_params,
&header,
rkcommon_check_params,
-
rkimage_verify_header
,
-
rkimage_print_header
,
+
NULL
,
+
NULL
,
rkimage_set_header,
rkimage_set_header,
-
rkimage_extract_subimage
,
+
NULL
,
rkimage_check_image_type,
NULL,
NULL
rkimage_check_image_type,
NULL,
NULL