From 6ba8eeb6f17c08a7a7fd97683161330d01a8ef2e Mon Sep 17 00:00:00 2001 From: Vitaly Wool Date: Tue, 6 Apr 2021 10:50:16 +0300 Subject: [PATCH] riscv: booti: do not force relocation if force_reloc is not set If force_reloc flag is not set and booti is called for an address ouside RAM (i. e. QSPI NOR flash), we should honor that and not try to force relocation in a bogus fashion. Signed-off-by: Vitaly Wool Reviewed-by: Leo Yu-Chi Liang --- arch/riscv/lib/image.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c index 47f2edcf7f..a65a5b8d17 100644 --- a/arch/riscv/lib/image.c +++ b/arch/riscv/lib/image.c @@ -50,7 +50,12 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size, return -EINVAL; } *size = lhdr->image_size; - *relocated_addr = gd->ram_base + lhdr->text_offset; + if (force_reloc || + (gd->ram_base <= image && image < gd->ram_base + gd->ram_size)) { + *relocated_addr = gd->ram_base + lhdr->text_offset; + } else { + *relocated_addr = image; + } unmap_sysmem(lhdr); -- 2.39.5