diff options
| author | Tom Rini <trini@konsulko.com> | 2023-03-24 22:25:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-03-24 22:25:28 -0400 |
| commit | 4b635046b5e92e419fbd1bf93e5b0ef86dbcadc2 (patch) | |
| tree | 04ca753e2ad4105e13d5744f9be5256b96b54edf /tools/kwbimage.c | |
| parent | 884d626d8357853c012d535bf26c143bb7b5e6a5 (diff) | |
| parent | 66cf977716e7118819801482d0a9566661120e94 (diff) | |
Merge branch 'next' of https://source.denx.de/u-boot/custodians/u-boot-marvell into next
- mvebu: kwboot: Fix UART booting (Pali)
- mvebu: doc: Misc updates / fixes (Pali)
- kirkwood: Early init enhancements, e.g. for DEBUG UART (Pali & Tony)
- mvebu: Enable NAND flash for Thecus N2350 board (Tony)
- mvebu: Set common SPI flash default speed and mode (Tony)
Diffstat (limited to 'tools/kwbimage.c')
| -rw-r--r-- | tools/kwbimage.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tools/kwbimage.c b/tools/kwbimage.c index 309657a563..177084adf8 100644 --- a/tools/kwbimage.c +++ b/tools/kwbimage.c @@ -1231,6 +1231,16 @@ static size_t image_headersz_v1(int *hasext) if (count > 0) headersz += sizeof(struct register_set_hdr_v1) + 8 * count + 4; + /* + * For all images except UART, headersz stored in header itself should + * contains header size without padding. For UART image BootROM rounds + * down headersz to multiply of 128 bytes. Therefore align UART headersz + * to multiply of 128 bytes to ensure that remaining UART header bytes + * are not ignored by BootROM. + */ + if (image_get_bootfrom() == IBR_HDR_UART_ID) + headersz = ALIGN(headersz, 128); + return headersz; } |