diff options
| author | Philipp Tomsich | 2017-04-17 17:48:01 +0200 |
|---|---|---|
| committer | Simon Glass | 2017-05-10 13:37:21 -0600 |
| commit | 366aad4d97846d02f32e8a6a824c4d6e9e5345c6 (patch) | |
| tree | 5cb0dcf63f812beb830c14ccda98859ee18c807d /tools/rkcommon.h | |
| parent | 798c93faf3b86f0eee542fbe8698618e05b48a09 (diff) | |
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.h')
| -rw-r--r-- | tools/rkcommon.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/rkcommon.h b/tools/rkcommon.h index cc161a647ca..a21321fe83a 100644 --- a/tools/rkcommon.h +++ b/tools/rkcommon.h @@ -83,8 +83,14 @@ void rkcommon_rc4_encode_spl(void *buf, unsigned int offset, unsigned int size); * @params: Pointer to the tool params structure * @tparams: Pointer tot the image type structure (for setting * the header and header_size) + * @alignment: Alignment (a power of two) that the image should be + * padded to (e.g. 512 if we want to align with SD/MMC + * blocksizes or 2048 for the SPI format) + * + * @return bytes of padding required/added (does not include the header_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); #endif |