From: Kumar Gala Date: Thu, 22 Oct 2009 04:29:51 +0000 (-0500) Subject: fdt: Fix fdt padding issue for initrd mem_rsv X-Git-Tag: v2009.11-rc1~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d535a493004fb701f131b132402a7704f9c9342d;p=oweals%2Fu-boot.git fdt: Fix fdt padding issue for initrd mem_rsv 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 Acked-by: Gerald Van Baren --- diff --git a/common/fdt_support.c b/common/fdt_support.c index 40ff00a154..9adaeb3db7 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -604,10 +604,11 @@ int fdt_resize(void *blob) /* * 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) + - 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 */ actualsize = ALIGN(actualsize + ((uint)blob & 0xfff), 0x1000);