| Message ID | e95baaa2268117b7b5093d73624f2925aeb0126b.1595948268.git.baruch@tkos.co.il |
|---|---|
| State | Accepted |
| Commit | f2d58f3bdad30ac088f76cce38a2e64a6c640f19 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | cmd: bootz: fix device-tree overlap test | expand |
On Tue, Jul 28, 2020 at 05:57:48PM +0300, Baruch Siach wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/cmd/bootz.c b/cmd/bootz.c index 1c8b0cf89f92..7556cd2752a8 100644 --- a/cmd/bootz.c +++ b/cmd/bootz.c @@ -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;
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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)