Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-24 05:54:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(fiptool): avoid packing the zero size images in the FIP" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2021-12-22 15:32:14 +01:00 • committed by TrustedFirmware Code Review
commit d76346b940
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.cz.json
View file

@ -809,6 +809,10 @@
{
"title": "STM32 Image",
"scopes": ["stm32image", "tools/stm32image"]
},
{
"title": "fiptool",
"scopes": ["fiptool"]
}
]
},

2
tools/fiptool/fiptool.c
View file

@ -537,7 +537,7 @@ static int pack_images(const char *filename, uint64_t toc_flags, unsigned long a
for (desc = image_desc_head; desc != NULL; desc = desc->next) {
image_t *image = desc->image;
if (image == NULL)
if (image == NULL || (image->toc_e.size == 0ULL))
continue;
payload_size += image->toc_e.size;
entry_offset = (entry_offset + align - 1) & ~(align - 1);