summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorPeng Fan <Peng.Fan@freescale.com>2015-11-24 16:54:22 +0800
committerTom Rini <trini@konsulko.com>2015-12-05 18:22:15 -0500
commit2ea47be02f356ff275fa5c50392ea510ddb4a96c (patch)
tree31471c815492c6ee6399efde21cf06b74e2240cb /common
parentaa722529635c16c52d9d609122fecc96ec8d03e4 (diff)
downloadblackbird-obmc-uboot-2ea47be02f356ff275fa5c50392ea510ddb4a96c.tar.gz
blackbird-obmc-uboot-2ea47be02f356ff275fa5c50392ea510ddb4a96c.zip
common: image-fdt: correct fdt_blob for IMAGE_FORMAT_LEGACY
If condition of "(load == image_start || load == image_data)" is true, should use "fdt_addr = load;", but not "fdt_blob = (char *)image_data;", or fdt_blob will be overridden by "fdt_blob = map_sysmem(fdt_addr, 0);" at the end of the switch case. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> Cc: Simon Glass <sjg@chromium.org> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Max Krummenacher <max.krummenacher@toradex.com> Cc: Marek Vasut <marex@denx.de> Cc: Suriyan Ramasami <suriyan.r@gmail.com> Cc: Paul Kocialkowski <contact@paulk.fr> Cc: Tom Rini <trini@konsulko.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/image-fdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/image-fdt.c b/common/image-fdt.c
index 5180a03a61..5e4e5bd914 100644
--- a/common/image-fdt.c
+++ b/common/image-fdt.c
@@ -326,7 +326,7 @@ int boot_get_fdt(int flag, int argc, char * const argv[], uint8_t arch,
if (load == image_start ||
load == image_data) {
- fdt_blob = (char *)image_data;
+ fdt_addr = load;
break;
}
OpenPOWER on IntegriCloud