Commit f242a088 authored by Peter Korsgaard's avatar Peter Korsgaard Committed by Gerald Van Baren

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: default avatarPeter Korsgaard <jacmet@sunsite.dk>
Acked-by: default avatarAndy Fleming <afleming@freescale.com>
parent d685b74c
...@@ -602,9 +602,12 @@ int fdt_resize(void *blob) ...@@ -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) + 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 */ /* Make it so the fdt ends on a page boundary */
actualsize = ALIGN(actualsize, 0x1000); actualsize = ALIGN(actualsize, 0x1000);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment