From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kumar Gala Date: Wed, 21 Oct 2009 23:29:51 -0500 Subject: [U-Boot] [PATCH] fdt: Fix fdt padding issue for initrd mem_rsv Message-ID: <1256185791-5492-1-git-send-email-galak@kernel.crashing.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 --- Wolfgang, this has been a long standing bug but only shows up if the fdt blob happens to be a particular size. Please include this for the v2009.11 release. - k common/fdt_support.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index 89164a1..fecd904 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); -- 1.6.0.6