dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 00:32:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

rockchip: mkimage: rewrite padding calculation for SD/MMC and SPI images

Browse Source 
In (first) breaking and (then) fixing the rkspi tool, I realised that
the calculation of the required padding (for the header-size and the
2K-in-every-4K SPI layout) was not as self-explainatory as it could
have been.  This change rewrites the code (using new, common functions
in rkcommon.c) and adds verbose in-line comments to ensure that we
won't fall into the same pit in the future...

Tested on the RK3399 (with has a boot0-style payload) with SD/MMC and SPI.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Philipp Tomsich
2017-04-17 17:48:01 +02:00
committed by Simon Glass
parent 798c93faf3
commit 366aad4d97
4 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
tools/rkspi.c
View File

@@ -39,8 +39,8 @@ static void rkspi_set_header(void *buf, struct stat *sbuf, int ifd,
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);
printf("Warning: SPL image is too large (size %#x) and will "
"not boot\n", size);
}
/*
@@ -71,23 +71,36 @@ static int rkspi_check_image_type(uint8_t type)
return EXIT_FAILURE;
}
/* We pad the file out to a fixed size - this method returns that size */
/*
* 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 pad_size;
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;
rkcommon_vrec_header(params, tparams);
/*
* 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;
pad_size = ROUND(rkcommon_get_spl_size(params), 0x800);
params->orig_file_size = pad_size;
/* We will double the image size due to the SPI format */
pad_size += RK_SPL_HDR_START;
pad_size *= 2;
debug("pad_size %x\n", pad_size);
return pad_size - params->file_size - tparams->header_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;
}
/*