diff mbox

[U-Boot,v2,2/6] imx: Use correct imx25 reset.c

Message ID 1309948113-12971-3-git-send-email-weisserm@arcor.de
State Accepted
Commit dea5387d98d809ce0a9c764e4b82b90b2d61b868
Delegated to: Stefano Babic
Headers show

Commit Message

Matthias Weisser July 6, 2011, 10:28 a.m. UTC 
imx25 used the wrong reset.c from imx27

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
Changes in v2:
  - Removed unrelated change

 arch/arm/cpu/arm926ejs/mx25/Makefile |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Comments

Stefano Babic July 13, 2011, 11:33 a.m. UTC | #1 
On 07/06/2011 12:28 PM, Matthias Weisser wrote:
> imx25 used the wrong reset.c from imx27
> 
> Signed-off-by: Matthias Weisser <weisserm@arcor.de>

Appplied to u-boot-imx, thanks

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/arch/arm/cpu/arm926ejs/mx25/Makefile b/arch/arm/cpu/arm926ejs/mx25/Makefile
index 38d7f03..3c2a65e 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)