ARMv8: fix error in freeing stack frame

[people/ms/u-boot.git] / arch / arm / lib / relocate_64.S

diff --git a/arch/arm/lib/relocate_64.S b/arch/arm/lib/relocate_64.S
index 242e56e960848136fb2c61bb2eea12fd249f1d77..fdba004363af38de84ad7d8cd33db556aa6de4d7 100644 (file)
--- a/arch/arm/lib/relocate_64.S
+++ b/arch/arm/lib/relocate_64.S
@@ -68,11 +68,11 @@ relocate_done:
        b       0f
 1:     mrs     x0, sctlr_el1
 0:     tbz     w0, #2, 5f      /* skip flushing cache if disabled */
-       tbz     w0, #12, 4f     /* invalide i-cache is enabled */
+       tbz     w0, #12, 4f     /* skip invalidating i-cache if disabled */
        ic      iallu           /* i-cache invalidate all */
        isb     sy
 4:     ldp     x0, x1, [sp, #16]
        bl      __asm_flush_dcache_range
-5:     ldp     x29, x30, [sp],#16
+5:     ldp     x29, x30, [sp],#32
        ret
 ENDPROC(relocate_code)