]> git.sur5r.net Git - u-boot/commitdiff
arm64: booti: add missing unmap_sysmem()
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 29 Mar 2016 10:51:57 +0000 (19:51 +0900)
committerTom Rini <trini@konsulko.com>
Fri, 1 Apr 2016 21:17:57 +0000 (17:17 -0400)
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>
cmd/bootm.c

index 555ccbc379f01697460981b0a00984e7c12e92b0..1bca6fa920ec4d5ed5f5b8919e0a5b47f59d4131 100644 (file)
@@ -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.