diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-17 08:19:40 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-17 08:19:40 -0500 |
| commit | 0c4b382f9041f9f2f00246c8a0ece90dae5451be (patch) | |
| tree | a2307a0658de178c47d7a063c169347e60e1810c /arch/arm/lib/memcpy.S | |
| parent | 1d6edcbfed2af33c748f2beb399810a0441888da (diff) | |
| parent | ad890cace37d0e2d3e0f9649bdb9c320947e4bb0 (diff) | |
Merge branch '2018-11-16-master-imports'
- Initial bcm968580xref, am65x_evm_r5 support
- lpc32xx, omap3_logic/am3517_evm updates
- pinctrl command
- fs_loader available for SPL
Diffstat (limited to 'arch/arm/lib/memcpy.S')
| -rw-r--r-- | arch/arm/lib/memcpy.S | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index 0ca61210da..f7fb77235c 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -59,7 +59,7 @@ #endif ENTRY(memcpy) cmp r0, r1 - moveq pc, lr + bxeq lr enter r4, lr @@ -147,7 +147,8 @@ ENTRY(memcpy) str1b r0, r4, cs, abort=21f str1b r0, ip, cs, abort=21f - exit r4, pc + exit r4, lr + bx lr 9: rsb ip, ip, #4 cmp ip, #2 @@ -256,7 +257,8 @@ ENTRY(memcpy) .endm .macro copy_abort_end - ldmfd sp!, {r4, pc} + ldmfd sp!, {r4, lr} + bx lr .endm ENDPROC(memcpy) |