]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
cmd: bootz: fix device-tree overlap test
authorBaruch Siach <baruch@tkos.co.il>
Tue, 28 Jul 2020 14:57:48 +0000 (17:57 +0300)
committerTom Rini <trini@konsulko.com>
Wed, 5 Aug 2020 12:18:34 +0000 (08:18 -0400)
The address of the kernel image is stored in images->ep. zi_start is the
offset of execution entry in the image, which is usually 0 for ARM
zImage.

Fixes boot error when ftd is stored near RAM address 0x0:

ERROR: FDT image overlaps OS image (OS=0x0..0x5fd608)

Fixes: fbde7589ce30 ("common: bootm: add checks to verify if ramdisk / fdtimage overlaps OS image")
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
cmd/bootz.c

index 1c8b0cf89f9295a36195db91c33945ee2946e1a0..7556cd2752a8ec30779feef7db00c884e8363618 100644 (file)
@@ -54,7 +54,7 @@ static int bootz_start(struct cmd_tbl *cmdtp, int flag, int argc,
         * Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
         * have a header that provide this informaiton.
         */
-       if (bootm_find_images(flag, argc, argv, zi_start, zi_end - zi_start))
+       if (bootm_find_images(flag, argc, argv, images->ep, zi_end - zi_start))
                return 1;
 
        return 0;