mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
2fb371ff64
The rockchip image generation was previously missing the ability to
verify the generated header (and dump the image-type) without having
to resort to hexdump or od. Experience in our testing has showed it
to be very easy to get the rkspi and rksd images mixed up and the
lab... so we add the necessary support to have dumpimage tell us
what image type we're dealing with.
This change set adds the verify_header and print_header capability
to the rksd/rkspi image drivers (through shared code in rkcommon).
As of now, we only support images fully that are not RC4-encoded for
the SPL payload (i.e. header1 and payload). For RC4-encoded payloads,
the outer header (header0) is checked, but no detection of whether
this is a SD/MMC or SPI formatted payload takes place.
The output of dumpsys now prints the image type (spl_hdr), whether it
is a SD/MMC or SPI image, and the (padded) size of the image:
$ ./tools/dumpimage -l ./spl.img
Image Type: Rockchip RK33 (SD/MMC) boot image
^^^^^^ SD/MMC vs. SPI indication
^^^^ spl_hdr indicated by the image
Data Size: 79872 bytes
Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>
72 lines
1.6 KiB
C
72 lines
1.6 KiB
C
/*
|
|
* (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
|
|
*/
|
|
|
|
#include "imagetool.h"
|
|
#include <image.h>
|
|
#include <rc4.h>
|
|
#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)
|
|
return EXIT_SUCCESS;
|
|
else
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
static int rksd_vrec_header(struct image_tool_params *params,
|
|
struct image_type_params *tparams)
|
|
{
|
|
/*
|
|
* Pad to the RK_BLK_SIZE (512 bytes) to be consistent with init_size
|
|
* being encoded in RK_BLK_SIZE units in header0 (see rkcommon.c).
|
|
*/
|
|
return rkcommon_vrec_header(params, tparams, RK_BLK_SIZE);
|
|
}
|
|
|
|
/*
|
|
* rk_sd parameters
|
|
*/
|
|
U_BOOT_IMAGE_TYPE(
|
|
rksd,
|
|
"Rockchip SD Boot Image support",
|
|
0,
|
|
NULL,
|
|
rkcommon_check_params,
|
|
rkcommon_verify_header,
|
|
rkcommon_print_header,
|
|
rksd_set_header,
|
|
NULL,
|
|
rksd_check_image_type,
|
|
NULL,
|
|
rksd_vrec_header
|
|
);
|