diff options
| author | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-04-17 15:48:01 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2017-05-10 19:37:21 (GMT) |
| commit | 366aad4d97846d02f32e8a6a824c4d6e9e5345c6 (patch) | |
| tree | 5cb0dcf63f812beb830c14ccda98859ee18c807d /tools/rkcommon.c | |
| parent | 798c93faf3b86f0eee542fbe8698618e05b48a09 (diff) | |
| download | u-boot-366aad4d97846d02f32e8a6a824c4d6e9e5345c6.tar.xz | |
rockchip: mkimage: rewrite padding calculation for SD/MMC and SPI images
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>
Diffstat (limited to 'tools/rkcommon.c')
| -rw-r--r-- | tools/rkcommon.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/tools/rkcommon.c b/tools/rkcommon.c index 5568b73..9595858 100644 --- a/tools/rkcommon.c +++ b/tools/rkcommon.c @@ -200,9 +200,13 @@ void rkcommon_rc4_encode_spl(void *buf, unsigned int offset, unsigned int size) } } -void rkcommon_vrec_header(struct image_tool_params *params, - struct image_type_params *tparams) +int rkcommon_vrec_header(struct image_tool_params *params, + struct image_type_params *tparams, + unsigned int alignment) { + unsigned int unpadded_size; + unsigned int padded_size; + /* * The SPL image looks as follows: * @@ -228,4 +232,17 @@ void rkcommon_vrec_header(struct image_tool_params *params, /* Allocate, clear and install the header */ tparams->hdr = malloc(tparams->header_size); memset(tparams->hdr, 0, tparams->header_size); + tparams->header_size = tparams->header_size; + + /* + * If someone passed in 0 for the alignment, we'd better handle + * it correctly... + */ + if (!alignment) + alignment = 1; + + unpadded_size = tparams->header_size + params->file_size; + padded_size = ROUND(unpadded_size, alignment); + + return padded_size - unpadded_size; } |