mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 15:41:40 +00:00
fdt_resize(): ensure minimum padding
fdt_add_mem_rsv() requires space for a struct fdt_reserve_entry (16 bytes), so make sure that fdt_resize at least adds that much padding, no matter what the location or size of the fdt is. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> Acked-by: Andy Fleming <afleming@freescale.com>
This commit is contained in:
parent
d685b74c64
commit
f242a08871
1 changed files with 5 additions and 2 deletions
|
@ -602,9 +602,12 @@ int fdt_resize(void *blob)
|
|||
}
|
||||
}
|
||||
|
||||
/* Calculate the actual size of the fdt */
|
||||
/*
|
||||
* Calculate the actual size of the fdt
|
||||
* plus the size needed for fdt_add_mem_rsv
|
||||
*/
|
||||
actualsize = fdt_off_dt_strings(blob) +
|
||||
fdt_size_dt_strings(blob);
|
||||
fdt_size_dt_strings(blob) + sizeof(struct fdt_reserve_entry);
|
||||
|
||||
/* Make it so the fdt ends on a page boundary */
|
||||
actualsize = ALIGN(actualsize, 0x1000);
|
||||
|
|
Loading…
Reference in a new issue