]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
common: image-fdt: correct fdt_blob for IMAGE_FORMAT_LEGACY
authorPeng Fan <Peng.Fan@freescale.com>
Tue, 24 Nov 2015 08:54:22 +0000 (16:54 +0800)
committerTom Rini <trini@konsulko.com>
Sat, 5 Dec 2015 23:22:15 +0000 (18:22 -0500)
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>
common/image-fdt.c

index 5180a03a61bfdeed9014b651bf83a4cb9ee0b4dc..5e4e5bd914e8757f8e413586143a3067ecb7da37 100644 (file)
@@ -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;
                        }