projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
memcpy.S
diff --git
a/arch/arm/lib/memcpy.S
b/arch/arm/lib/memcpy.S
index eeaf0035297efb010dbf14e3848e619f5f2b6d50..00602e9cf820b7c71bd1a6b9c90f87c463e82a3c 100644
(file)
--- a/
arch/arm/lib/memcpy.S
+++ b/
arch/arm/lib/memcpy.S
@@
-13,12
+13,6
@@
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
-#ifdef CONFIG_SYS_THUMB_BUILD
-#define W(instr) instr.w
-#else
-#define W(instr) instr
-#endif
-
#define LDR1W_SHIFT 0
#define STR1W_SHIFT 0
#define LDR1W_SHIFT 0
#define STR1W_SHIFT 0
@@
-62,7
+56,7
@@
/* Prototype: void *memcpy(void *dest, const void *src, size_t n); */
.syntax unified
/* Prototype: void *memcpy(void *dest, const void *src, size_t n); */
.syntax unified
-#if
def CONFIG_SYS_THUMB_BUILD
+#if
defined(CONFIG_SYS_THUMB_BUILD) && !defined(MEMCPY_NO_THUMB_BUILD)
.thumb
.thumb_func
#endif
.thumb
.thumb_func
#endif