diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-01-18 21:11:05 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-01-18 21:11:05 +0100 |
| commit | 65ff9968027335accc77dcb8884d4951c34f3132 (patch) | |
| tree | cbbaea690aaf08a5b8fe64b280d6be1062f75459 | |
| parent | 4cda437898f7873752f0201757cd33f12196ce87 (diff) | |
| parent | c088a108c75db565e07292fd668dfa5491e85bc2 (diff) | |
| download | u-boot-imx-65ff9968027335accc77dcb8884d4951c34f3132.zip u-boot-imx-65ff9968027335accc77dcb8884d4951c34f3132.tar.gz u-boot-imx-65ff9968027335accc77dcb8884d4951c34f3132.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
| -rw-r--r-- | common/fdt_support.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 5a83bca..a79bc08 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 */ |