From: Kumar Gala Date: Wed, 6 Jul 2011 15:16:28 +0000 (+0000) Subject: powerpc: Fix device tree padding associated with ramdisk X-Git-Tag: v2011.09-rc1~200 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e9579bbf9780ced1153371cdc6aeb1ea8f0c0b6;p=kernel%2Fu-boot.git powerpc: Fix device tree padding associated with ramdisk When booting with a ramdisk we bump the amount of memory reserved for the device tree by FDT_RAMDISK_OVERHEAD. However we did not increase the actual size in the device tree blob to match. Its possible on boundary cases that we dont have enough memory according to the device tree blob and get errors like: WARNING: could not set linux,initrd-end FDT_ERR_NOSPACE We can easily fix this by setting the device tree size at the same time we bump the amount of memory reserved for the device tree. Signed-off-by: Kumar Gala Acked-by: Gerald Van Baren --- diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index e01787d..4e0cb8f 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -288,8 +288,10 @@ static int boot_body_linux(bootm_headers_t *images) return ret; of_size = ret; - if (*initrd_start && *initrd_end) + if (*initrd_start && *initrd_end) { of_size += FDT_RAMDISK_OVERHEAD; + fdt_set_totalsize(*of_flat_tree, of_size); + } /* Create a new LMB reservation */ lmb_reserve(lmb, (ulong)*of_flat_tree, of_size);