diff options
author | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:48:09 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-04-27 21:48:09 +0200 |
commit | f38536f9138c253b0c1f9c72093a7ec6808e638f (patch) | |
tree | 43bd82d4f1f96f549821d5fd941dfdc70712b501 /arch/arm/lib/Makefile | |
parent | 34b5fc4d8bba594d53a15be970ca78b03db9d7f5 (diff) | |
parent | d32a1a4caa2a2ca7c385f4489167e170bf7fb5c1 (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/lib/Makefile')
-rw-r--r-- | arch/arm/lib/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile index 454440c057a..03b1b5e4af8 100644 --- a/arch/arm/lib/Makefile +++ b/arch/arm/lib/Makefile @@ -44,6 +44,8 @@ COBJS-y += cache-cp15.o endif COBJS-y += interrupts.o COBJS-y += reset.o +SOBJS-$(CONFIG_USE_ARCH_MEMSET) += memset.o +SOBJS-$(CONFIG_USE_ARCH_MEMCPY) += memcpy.o SRCS := $(GLSOBJS:.o=.S) $(GLCOBJS:.o=.c) \ $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) |