summaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2016-03-29 19:51:57 +0900
committerTom Rini <trini@konsulko.com>2016-04-01 17:17:57 -0400
commit62022d5206a284e8fb7f205b4baa7f2550ee9a35 (patch)
tree8c96702c256a368181672674829c060dded4ad22 /cmd
parent27ce6965389fd2ee2104f3c0d75695b34a232f45 (diff)
downloadtalos-obmc-uboot-62022d5206a284e8fb7f205b4baa7f2550ee9a35.tar.gz
talos-obmc-uboot-62022d5206a284e8fb7f205b4baa7f2550ee9a35.zip
arm64: booti: add missing unmap_sysmem()
Make sure to call unmap_sysmem() for address allocated by map_sysmem() before leaving the function; however this patch gives no impact on the behavior because map_sysmem()/unmap_sysmem() does nothing except on Sandbox. Sandbox never runs this code because "booti" is a command for booting ARM64 kernel image. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/bootm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/cmd/bootm.c b/cmd/bootm.c
index 555ccbc379..1bca6fa920 100644
--- a/cmd/bootm.c
+++ b/cmd/bootm.c
@@ -673,6 +673,9 @@ static int booti_setup(bootm_headers_t *images)
* correct location and then move the image there.
*/
dst = gd->bd->bi_dram[0].start + le32_to_cpu(ih->text_offset);
+
+ unmap_sysmem(ih);
+
if (images->ep != dst) {
void *src;
@@ -717,6 +720,8 @@ static int booti_start(cmd_tbl_t *cmdtp, int flag, int argc,
lmb_reserve(&images->lmb, images->ep, le32_to_cpu(ih->image_size));
+ unmap_sysmem(ih);
+
/*
* Handle the BOOTM_STATE_FINDOTHER state ourselves as we do not
* have a header that provide this informaiton.
OpenPOWER on IntegriCloud