diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-05 10:16:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-05 13:40:42 -0400 |
| commit | a4b38fca7e83f0556c0afc96492741e4464444df (patch) | |
| tree | 9be8746db8e6a1e9488b40aa347381684175025a /tools | |
| parent | 46031b3aa08814f797a379356750aa5fb94cd3f7 (diff) | |
| parent | f25c1755a715d0d1794bd0827549367c20182501 (diff) | |
| download | u-boot-a4b38fca7e83f0556c0afc96492741e4464444df.zip u-boot-a4b38fca7e83f0556c0afc96492741e4464444df.tar.gz u-boot-a4b38fca7e83f0556c0afc96492741e4464444df.tar.bz2 | |
Merge tag 'rockchip-for-v2018.11-rc2' of git://git.denx.de/u-boot-rockchip
Rockchip-focused changes for v2018.11-rc2:
- fixes to rkimage for SPL boot via USB
- fixes to make_fit_atf.py, incl. entry-point calculation and python3
compatibility
- OP-TEE support for ARMv7-based SoCs
- fixes to RGMII/GMII selection on the RK3328
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/rkimage.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/rkimage.c b/tools/rkimage.c index a0a3185..ae50de5 100644 --- a/tools/rkimage.c +++ b/tools/rkimage.c @@ -15,8 +15,7 @@ static uint32_t header; 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); if (rkcommon_need_rc4_spl(params)) rkcommon_rc4_encode_spl(buf, 4, params->file_size); @@ -36,7 +35,7 @@ static int rkimage_check_image_type(uint8_t type) U_BOOT_IMAGE_TYPE( rkimage, "Rockchip Boot Image support", - 4, + 0, &header, rkcommon_check_params, NULL, |