Merge remote-tracking branch 'u-boot/master'

[u-boot] / arch / arm / lib / memcpy.S

diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S
index 40db90e5f45b5663a459e6d6865eb950d4c7adef..f655256b5d1514f949b880c322cb225a73cd538b 100644 (file)
--- a/arch/arm/lib/memcpy.S
+++ b/arch/arm/lib/memcpy.S
@@ -60,6 +60,9 @@
 .globl memcpy
 memcpy:
 
+               cmp     r0, r1
+               moveq   pc, lr
+
                enter   r4, lr
 
                subs    r2, r2, #4
@@ -238,4 +241,3 @@ memcpy:
 17:            forward_copy_shift      pull=16 push=16
 
 18:            forward_copy_shift      pull=24 push=8
-