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

rockchip: mkimage: force 2KB alignment for init_size

Browse Source 
The Rockchip BootROM relies on init_size being aligned to 2KB
(see https://lists.denx.de/pipermail/u-boot/2017-May/293268.html).

This pads the image to 2KB both for SD card images and SPI images
and uses a common symbolic constant for the alignment.

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Philipp Tomsich
2017-05-30 23:32:09 +02:00
committed by Simon Glass
parent 2fb371ff64
commit ad972ac3d9
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tools/rkcommon.h
View File

@@ -10,6 +10,7 @@
enum { enum {
RK_BLK_SIZE = 512, RK_BLK_SIZE = 512,
RK_INIT_SIZE_ALIGN = 2048,
RK_INIT_OFFSET = 4, RK_INIT_OFFSET = 4,
RK_MAX_BOOT_SIZE = 512 << 10, RK_MAX_BOOT_SIZE = 512 << 10,
RK_SPL_HDR_START = RK_INIT_OFFSET * RK_BLK_SIZE, RK_SPL_HDR_START = RK_INIT_OFFSET * RK_BLK_SIZE,

6
tools/rksd.c
View File

@@ -46,10 +46,10 @@ static int rksd_vrec_header(struct image_tool_params *params,
struct image_type_params *tparams) struct image_type_params *tparams)
{ {
/* /*
* Pad to the RK_BLK_SIZE (512 bytes) to be consistent with init_size * Pad to a 2KB alignment, as required for init_size by the ROM
* being encoded in RK_BLK_SIZE units in header0 (see rkcommon.c). * (see https://lists.denx.de/pipermail/u-boot/2017-May/293268.html)
*/ */
return rkcommon_vrec_header(params, tparams, RK_BLK_SIZE); return rkcommon_vrec_header(params, tparams, RK_INIT_SIZE_ALIGN);
} }
/* /*

2
tools/rkspi.c
View File

@@ -63,7 +63,7 @@ static int rkspi_check_image_type(uint8_t type)
static int rkspi_vrec_header(struct image_tool_params *params, static int rkspi_vrec_header(struct image_tool_params *params,
struct image_type_params *tparams) struct image_type_params *tparams)
{ {
int padding = rkcommon_vrec_header(params, tparams, 2048); int padding = rkcommon_vrec_header(params, tparams, RK_INIT_SIZE_ALIGN);
/* /*
* The file size has not been adjusted at this point (our caller will * 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 * eventually add the header/padding to the file_size), so we need to