summaryrefslogtreecommitdiffstats
path: root/lib_ppc
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-11 22:30:47 +0200
committerWolfgang Denk <wd@denx.de>2008-06-11 22:30:47 +0200
commitcdeb62e20d94005f2e80604fda03b498c3a6f704 (patch)
tree3a94ce9524267f7d9e3f689e9cf27f22f756065b /lib_ppc
parent1859e42fbf996e0e883cdb9829ef6d260bf4cdd6 (diff)
parentae9e97fa96f643c8ba2b666b06a026cc8717eb00 (diff)
downloadblackbird-obmc-uboot-cdeb62e20d94005f2e80604fda03b498c3a6f704.tar.gz
blackbird-obmc-uboot-cdeb62e20d94005f2e80604fda03b498c3a6f704.zip
Merge branch 'master' of git://www.denx.de/git/u-boot-fdt
Diffstat (limited to 'lib_ppc')
-rw-r--r--lib_ppc/bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c
index 9194fd8b0a..0421ce4940 100644
--- a/lib_ppc/bootm.c
+++ b/lib_ppc/bootm.c
@@ -750,7 +750,7 @@ static int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base,
*of_flat_tree = (char *)of_start;
} else {
*of_flat_tree = fdt_blob;
- lmb_reserve(lmb, (ulong)fdt, of_len);
+ lmb_reserve(lmb, (ulong)working_fdt, of_len);
}
return 0;
OpenPOWER on IntegriCloud