diff options
| author | Tom Rini <[email protected]> | 2020-05-07 09:02:28 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-07 09:02:28 -0400 |
| commit | 69bf66ad8c0d53cc5e64d0f4f2e3bc9ad18e61aa (patch) | |
| tree | b89bafeea8ed15b1403edf892964adaa5003255d /tools | |
| parent | 1259567ae3cd4c84acb9db6ab1fadcdcd26968a9 (diff) | |
| parent | 5168d7a6264be30f82c1c074e43c24fcacbb4283 (diff) | |
Merge branch '2020-05-06-master-imports'
- ARM Juno updates
- Assorted bugfixes
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/fit_image.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/fit_image.c b/tools/fit_image.c index 1e0f1e9fce8..88ff093d05b 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -435,7 +435,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) int image_number; int align_size; - align_size = params->bl_len ? params->bl_len : 1; + align_size = params->bl_len ? params->bl_len : 4; fd = mmap_fdt(params->cmdname, fname, 0, &fdt, &sbuf, false, false); if (fd < 0) return -EIO; @@ -493,6 +493,7 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) fdt_pack(fdt); new_size = fdt_totalsize(fdt); + new_size = ALIGN(new_size, align_size); fdt_set_totalsize(fdt, new_size); debug("Size reduced from %x to %x\n", fit_size, fdt_totalsize(fdt)); debug("External data size %x\n", buf_ptr); |