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

Submitted by Matthias Weisser on June 30, 2011, 9:57 a.m.

Details

Message ID 1309427865-17531-3-git-send-email-weisserm@arcor.de
State Changes Requested
Headers show

Commit Message

Matthias Weisser June 30, 2011, 9:57 a.m.
imx25 used the wrong reset.c from imx27

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
 arch/arm/cpu/arm926ejs/mx25/Makefile |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

Comments

Wolfgang Denk June 30, 2011, 10:46 a.m.
Dear Matthias Weisser,

In message <1309427865-17531-3-git-send-email-weisserm@arcor.de> you wrote:
> imx25 used the wrong reset.c from imx27
> 
> Signed-off-by: Matthias Weisser <weisserm@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
> -- 

NAK.

See previous comments to Setano's postings.  It makes no sense to copy
identical lines into a large number of Makefiles.

Best regards,

Wolfgang Denk
Wolfgang Denk June 30, 2011, 10:49 a.m.
Dear Matthias Weisser,

In message <1309427865-17531-3-git-send-email-weisserm@arcor.de> you wrote:
> imx25 used the wrong reset.c from imx27
> 
> Signed-off-by: Matthias Weisser <weisserm@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
Matthias Weisser June 30, 2011, 11:30 a.m.
Hello Wolfgang

Am 30.06.2011 12:49, schrieb Wolfgang Denk:
>> +$(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.

You are right. That came in by accident. It should have been added in 
4/5 of the series. Will fix this in a v2.

Matthias
Matthias Weisser June 30, 2011, 11:35 a.m.
Hello Wolfgang

Am 30.06.2011 12:46, schrieb Wolfgang Denk:
>> +
>> +$(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
>> --
>
> NAK.
>
> See previous comments to Setano's postings.  It makes no sense to copy
> identical lines into a large number of Makefiles.

OK. I will address this point in a v2 of the series.

Matthias

Patch hide | download patch | download mbox

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