Patchwork [U-Boot] build: Add targets for auto gen of asm-offsets.h and use it in imx35

login
register
mail settings
Submitter Matthias Weisser
Date June 30, 2011, 3:24 p.m.
Message ID <1309447451-30948-1-git-send-email-weisserm@arcor.de>
Download mbox | patch
Permalink /patch/102773/
State Accepted
Commit f456445f29d22bb31ad29fdf1d6b2769decd37a2
Delegated to: Stefano Babic
Headers show

Comments

Matthias Weisser - June 30, 2011, 3:24 p.m.
asm-offsets.h should be auto generated. This patch adds two rules to rules.mk
which makes this possible and removes the rules on imx35.

Signed-off-by: Matthias Weisser <weisserm@arcor.de>
---
 arch/arm/cpu/arm1136/mx35/Makefile |   11 -----------
 rules.mk                           |   10 ++++++++++
 2 files changed, 10 insertions(+), 11 deletions(-)
Stefano Babic - July 1, 2011, 7:41 a.m.
On 06/30/2011 05:24 PM, Matthias Weisser wrote:
> asm-offsets.h should be auto generated. This patch adds two rules to rules.mk
> which makes this possible and removes the rules on imx35.
> 

Hi Matthias,

> diff --git a/rules.mk b/rules.mk
> index c2860e5..5fd12a0 100644
> --- a/rules.mk
> +++ b/rules.mk
> @@ -42,4 +42,14 @@ $(HOSTOBJS): $(obj)%.o: %.c

Agree. Moving the rules to a general place is the first step, as
suggested by Wolfgang.

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
Stefano Babic - July 6, 2011, 6:47 a.m.
On 06/30/2011 05:24 PM, Matthias Weisser wrote:
> asm-offsets.h should be auto generated. This patch adds two rules to rules.mk
> which makes this possible and removes the rules on imx35.
> 
> Signed-off-by: Matthias Weisser <weisserm@arcor.de>
> ---
>  arch/arm/cpu/arm1136/mx35/Makefile |   11 -----------
>  rules.mk                           |   10 ++++++++++
>  2 files changed, 10 insertions(+), 11 deletions(-)
> 
> diff --git a/arch/arm/cpu/arm1136/mx35/Makefile b/arch/arm/cpu/arm1136/mx35/Makefile
> index 20f36e3..284cdc5 100644
> --- a/arch/arm/cpu/arm1136/mx35/Makefile
> +++ b/arch/arm/cpu/arm1136/mx35/Makefile
> @@ -50,14 +50,3 @@ include $(SRCTREE)/rules.mk
>  sinclude $(obj).depend
>  

Applied to u-boot-imx, thanks.

Best regards,
Stefano Babic

Patch

diff --git a/arch/arm/cpu/arm1136/mx35/Makefile b/arch/arm/cpu/arm1136/mx35/Makefile
index 20f36e3..284cdc5 100644
--- a/arch/arm/cpu/arm1136/mx35/Makefile
+++ b/arch/arm/cpu/arm1136/mx35/Makefile
@@ -50,14 +50,3 @@  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
diff --git a/rules.mk b/rules.mk
index c2860e5..5fd12a0 100644
--- a/rules.mk
+++ b/rules.mk
@@ -42,4 +42,14 @@  $(HOSTOBJS): $(obj)%.o: %.c
 $(NOPEDOBJS): $(obj)%.o: %.c
 	$(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTCFLAGS_$(@F)) $(HOSTCFLAGS_$(BCURDIR)) -o $@ $< -c
 
+$(TOPDIR)/include/asm/arch/asm-offsets.h:	$(TOPDIR)/include/autoconf.mk.dep \
+	$(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.s
+	@echo Generating $@
+	$(TOPDIR)/tools/scripts/make-asm-offsets $(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.s $@
+
+$(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.s:	$(TOPDIR)/include/autoconf.mk.dep \
+	$(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.c
+	$(CC) -DDO_DEPS_ONLY \
+		$(CFLAGS) $(CFLAGS_$(BCURDIR)/$(@F)) $(CFLAGS_$(BCURDIR)) \
+		-o $@ $(TOPDIR)/$(CPUDIR)/$(SOC)/asm-offsets.c -c -S
 #########################################################################