Merge branch 'master' of /home/wd/git/u-boot/custodians

2009-01-18 21:11:05 +01:00 · 2009-01-18 21:11:05 +01:00 · 65ff996802
commit 65ff996802
parent 4cda437898 c088a108c7
1 changed files with 1 additions and 1 deletions
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@ -610,7 +610,7 @@ int fdt_resize(void *blob)
 		fdt_size_dt_strings(blob) + sizeof(struct fdt_reserve_entry);

 	/* Make it so the fdt ends on a page boundary */
-	actualsize = ALIGN(actualsize, 0x1000);
+	actualsize = ALIGN(actualsize + ((uint)blob & 0xfff), 0x1000);
 	actualsize = actualsize - ((uint)blob & 0xfff);

 	/* Change the fdt header to reflect the correct size */