mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-30 00:20:44 +09: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>
108 lines
2.8 KiB
C
108 lines
2.8 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 rkspi format
|
|
*/
|
|
|
|
#include "imagetool.h"
|
|
#include <image.h>
|
|
#include <rc4.h>
|
|
#include "mkimage.h"
|
|
#include "rkcommon.h"
|
|
|
|
enum {
|
|
RKSPI_SECT_LEN = RK_BLK_SIZE * 4,
|
|
};
|
|
|
|
static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
|
|
struct image_tool_params *params)
|
|
{
|
|
int sector;
|
|
unsigned int size;
|
|
int ret;
|
|
|
|
size = params->orig_file_size;
|
|
ret = rkcommon_set_header(buf, size, params);
|
|
debug("size %x\n", size);
|
|
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);
|
|
}
|
|
|
|
/*
|
|
* Spread the image out so we only use the first 2KB of each 4KB
|
|
* region. This is a feature of the SPI format required by the Rockchip
|
|
* boot ROM. Its rationale is unknown.
|
|
*/
|
|
for (sector = size / RKSPI_SECT_LEN - 1; sector >= 0; sector--) {
|
|
debug("sector %u\n", sector);
|
|
memmove(buf + sector * RKSPI_SECT_LEN * 2,
|
|
buf + sector * RKSPI_SECT_LEN,
|
|
RKSPI_SECT_LEN);
|
|
memset(buf + sector * RKSPI_SECT_LEN * 2 + RKSPI_SECT_LEN,
|
|
'\0', RKSPI_SECT_LEN);
|
|
}
|
|
}
|
|
|
|
static int rkspi_check_image_type(uint8_t type)
|
|
{
|
|
if (type == IH_TYPE_RKSPI)
|
|
return EXIT_SUCCESS;
|
|
else
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
/*
|
|
* The SPI payload needs to be padded out to make space for odd half-sector
|
|
* layout used in flash (i.e. only the first 2K of each 4K sector is used).
|
|
*/
|
|
static int rkspi_vrec_header(struct image_tool_params *params,
|
|
struct image_type_params *tparams)
|
|
{
|
|
int padding = rkcommon_vrec_header(params, tparams, 2048);
|
|
/*
|
|
* The file size has not been adjusted at this point (our caller will
|
|
* eventually add the header/padding to the file_size), so we need to
|
|
* add up the header_size, file_size and padding ourselves.
|
|
*/
|
|
int padded_size = tparams->header_size + params->file_size + padding;
|
|
|
|
/*
|
|
* We need to store the original file-size (i.e. before padding), as
|
|
* imagetool does not set this during its adjustment of file_size.
|
|
*/
|
|
params->orig_file_size = padded_size;
|
|
|
|
/*
|
|
* Converting to the SPI format (i.e. splitting each 4K page into two
|
|
* 2K subpages and then padding these 2K pages up to take a complete
|
|
* 4K sector again) will will double the image size.
|
|
*
|
|
* Thus we return the padded_size as an additional padding requirement
|
|
* (be sure to add this to the padding returned from the common code).
|
|
*/
|
|
return padded_size + padding;
|
|
}
|
|
|
|
/*
|
|
* rk_spi parameters
|
|
*/
|
|
U_BOOT_IMAGE_TYPE(
|
|
rkspi,
|
|
"Rockchip SPI Boot Image support",
|
|
0,
|
|
NULL,
|
|
rkcommon_check_params,
|
|
rkcommon_verify_header,
|
|
rkcommon_print_header,
|
|
rkspi_set_header,
|
|
NULL,
|
|
rkspi_check_image_type,
|
|
NULL,
|
|
rkspi_vrec_header
|
|
);
|