summaryrefslogtreecommitdiffstats
path: root/arch/arm/cpu/arm926ejs
diff options
context:
space:
mode:
authorMatthias Weisser <weisserm@arcor.de>2011-07-06 00:28:29 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-07-14 15:41:24 +0200
commitdea5387d98d809ce0a9c764e4b82b90b2d61b868 (patch)
tree76b9437d89734ccf0fba2dff91a5cd143f164b29 /arch/arm/cpu/arm926ejs
parenta7f39e7c222e0266a1ea7495adb7ed39076960a7 (diff)
downloadtalos-obmc-uboot-dea5387d98d809ce0a9c764e4b82b90b2d61b868.tar.gz
talos-obmc-uboot-dea5387d98d809ce0a9c764e4b82b90b2d61b868.zip
imx: Use correct imx25 reset.c
imx25 used the wrong reset.c from imx27 Signed-off-by: Matthias Weisser <weisserm@arcor.de>
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
-rw-r--r--arch/arm/cpu/arm926ejs/mx25/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/cpu/arm926ejs/mx25/Makefile b/arch/arm/cpu/arm926ejs/mx25/Makefile
index 38d7f03ab2..3c2a65ed79 100644
--- a/arch/arm/cpu/arm926ejs/mx25/Makefile
+++ b/arch/arm/cpu/arm926ejs/mx25/Makefile
@@ -24,12 +24,10 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(SOC).o
-COBJS = generic.o timer.o
-MX27OBJS = reset.o
+COBJS = generic.o timer.o reset.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
-SRCS += $(addprefix $(SRCTREE)/arch/arm/cpu/arm926ejs/mx27/,$(MX27OBJS:.o=.c))
-OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS) $(MX27OBJS))
+OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
all: $(obj).depend $(LIB)
OpenPOWER on IntegriCloud