mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
rockchip: mkimage: support packing optional second level boot-loader
Support packing optional second level boot-loader: $ ./tools/mkimage -n rk3399 -T rksd -d \ rk3399_ddr_800MHz_v1.24.bin:rk3399_miniloader_v1.19.bin out -v Adding Image rk3399_ddr_800MHz_v1.24.bin Size 116492(pad to 116736) Adding Image rk3399_miniloader_v1.19.bin Size 88060(pad to 88064) Image Type: Rockchip RK33 (SD/MMC) boot image Init Data Size: 116736 bytes Boot Data Size: 88064 bytes Mainly parse init file and boot file from datafile option, copy them to the image with 2KB alignment. Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
35
tools/rksd.c
35
tools/rksd.c
@@ -12,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(sjg@chromium.org): 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)
|
||||
@@ -41,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
|
||||
*/
|
||||
@@ -62,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
|
||||
);
|
||||
|
Reference in New Issue
Block a user