GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fdt: Fix fdt padding issue for initrd mem_rsv

Browse source 
Its possible that we end up with a device tree that happens to be a
particular size that after we call fdt_resize() we don't have any
space left for the initrd mem_rsv.

Fix this be adding a second mem_rsv into the size calculation.  We
had one to cover the fdt itself and we have the potential of adding
a second for the initrd.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
This commit is contained in:
Kumar Gala 2009-10-21 23:29:51 -05:00 • committed by Wolfgang Denk
parent 0ac59d0c07
commit d535a49300
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/fdt_support.c
View file

@ -604,10 +604,11 @@ 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 * plus the size needed for two fdt_add_mem_rsv, one
* for the fdt itself and one for a possible initrd
*/ */
actualsize = fdt_off_dt_strings(blob) + actualsize = fdt_off_dt_strings(blob) +
fdt_size_dt_strings(blob) + sizeof(struct fdt_reserve_entry); fdt_size_dt_strings(blob) + 2*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 + ((uint)blob & 0xfff), 0x1000); actualsize = ALIGN(actualsize + ((uint)blob & 0xfff), 0x1000);