summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-01-18 21:11:05 +0100
committerWolfgang Denk <wd@denx.de>2009-01-18 21:11:05 +0100
commit65ff9968027335accc77dcb8884d4951c34f3132 (patch)
treecbbaea690aaf08a5b8fe64b280d6be1062f75459
parent4cda437898f7873752f0201757cd33f12196ce87 (diff)
parentc088a108c75db565e07292fd668dfa5491e85bc2 (diff)
Merge branch 'master' of /home/wd/git/u-boot/custodians
-rw-r--r--common/fdt_support.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c
index 5a83bca481..a79bc085b2 100644
--- 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 */