Dear Matthias Weisser, In message <1309427865-17531-3-git-send-email-weiss...@arcor.de> you wrote: > imx25 used the wrong reset.c from imx27 > > Signed-off-by: Matthias Weisser <weiss...@arcor.de> > --- > arch/arm/cpu/arm926ejs/mx25/Makefile | 19 +++++++++++++++---- > 1 files changed, 15 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/cpu/arm926ejs/mx25/Makefile > b/arch/arm/cpu/arm926ejs/mx25/Makefile > index 38d7f03..eb0e7f5 100644 > --- a/arch/arm/cpu/arm926ejs/mx25/Makefile > +++ b/arch/arm/cpu/arm926ejs/mx25/Makefile > @@ -24,18 +24,18 @@ 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) > > $(LIB): $(OBJS) > $(call cmd_link_o_target, $(OBJS)) > > +$(OBJS) : $(TOPDIR)/include/asm/arch/asm-offsets.h > + > ######################################################################### > > # defines $(obj).depend target > @@ -44,3 +44,14 @@ include $(SRCTREE)/rules.mk > sinclude $(obj).depend > > ######################################################################### > + > +$(TOPDIR)/include/asm/arch/asm-offsets.h: > $(TOPDIR)/include/autoconf.mk.dep \ > + ./asm-offsets.s > + @echo Generating $@ > + $(TOPDIR)/tools/scripts/make-asm-offsets ./asm-offsets.s $@ > + > +asm-offsets.s: $(TOPDIR)/include/autoconf.mk.dep \ > + ./asm-offsets.c > + $(CC) -DDO_DEPS_ONLY \ > + $(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \ > + -o $@ ./asm-offsets.c -c -S > --
Also, the asm-offset change is unrelated to the other change mentioned in your commit message. These needs to be split into two separate commits. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Bus error -- please leave by the rear door. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
