diff options
| author | Stefano Babic <sbabic@denx.de> | 2011-09-05 04:32:28 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-09-07 21:41:27 +0200 |
| commit | a4814a69d3bca6ee05f4bfc4c4e965e8fcd544e6 (patch) | |
| tree | dee5379d7a265ab6c91a560252f83e7cacc1831a /arch/arm | |
| parent | 99ffccbd3e5b7bc715e2eed6ea6d36f4020b56d8 (diff) | |
| download | u-boot-imx-a4814a69d3bca6ee05f4bfc4c4e965e8fcd544e6.zip u-boot-imx-a4814a69d3bca6ee05f4bfc4c4e965e8fcd544e6.tar.gz u-boot-imx-a4814a69d3bca6ee05f4bfc4c4e965e8fcd544e6.tar.bz2 | |
Makefile : fix generation of cpu related asm-offsets.h
commit 0edf8b5b2fa0d210ebc4d6da0fd1aceeb7e44e47 breaks
building on a different directory with the O= parameter.
The patch wil fix this issue, generating always asm-offsets.h before
the other targets.
Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Matthias Weisser <weisserm@arcor.de>
CC: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/arm1136/mx35/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mb86r0x/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx25/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mx27/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx5/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx5/lowlevel_init.S | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx25/macro.h | 2 |
7 files changed, 2 insertions, 12 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/Makefile b/arch/arm/cpu/arm1136/mx35/Makefile index 284cdc5..469397c 100644 --- a/arch/arm/cpu/arm1136/mx35/Makefile +++ b/arch/arm/cpu/arm1136/mx35/Makefile @@ -39,8 +39,6 @@ all: $(obj).depend $(LIB) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) -$(OBJS) : $(TOPDIR)/include/asm/arch/asm-offsets.h - ######################################################################### diff --git a/arch/arm/cpu/arm926ejs/mb86r0x/Makefile b/arch/arm/cpu/arm926ejs/mb86r0x/Makefile index 974d0be..bab048b 100644 --- a/arch/arm/cpu/arm926ejs/mb86r0x/Makefile +++ b/arch/arm/cpu/arm926ejs/mb86r0x/Makefile @@ -37,8 +37,6 @@ all: $(obj).depend $(LIB) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) -$(OBJS) : $(TOPDIR)/include/asm/arch/asm-offsets.h - ######################################################################### # defines $(obj).depend target diff --git a/arch/arm/cpu/arm926ejs/mx25/Makefile b/arch/arm/cpu/arm926ejs/mx25/Makefile index 9219c06..3c2a65e 100644 --- a/arch/arm/cpu/arm926ejs/mx25/Makefile +++ b/arch/arm/cpu/arm926ejs/mx25/Makefile @@ -34,8 +34,6 @@ all: $(obj).depend $(LIB) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) -$(OBJS) : $(TOPDIR)/include/asm/arch/asm-offsets.h - ######################################################################### # defines $(obj).depend target diff --git a/arch/arm/cpu/arm926ejs/mx27/Makefile b/arch/arm/cpu/arm926ejs/mx27/Makefile index 7ac1a21..0e112b3 100644 --- a/arch/arm/cpu/arm926ejs/mx27/Makefile +++ b/arch/arm/cpu/arm926ejs/mx27/Makefile @@ -34,8 +34,6 @@ all: $(obj).depend $(LIB) $(LIB): $(OBJS) $(call cmd_link_o_target, $(OBJS)) -$(OBJS) : $(TOPDIR)/include/asm/arch/asm-offsets.h - ######################################################################### # defines $(obj).depend target diff --git a/arch/arm/cpu/armv7/mx5/Makefile b/arch/arm/cpu/armv7/mx5/Makefile index 6e13cc3..e8be9c9 100644 --- a/arch/arm/cpu/armv7/mx5/Makefile +++ b/arch/arm/cpu/armv7/mx5/Makefile @@ -45,6 +45,4 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend -lowlevel_init.o : $(TOPDIR)/include/asm/arch/asm-offsets.h - ######################################################################### diff --git a/arch/arm/cpu/armv7/mx5/lowlevel_init.S b/arch/arm/cpu/armv7/mx5/lowlevel_init.S index 6c66b42..7e37221 100644 --- a/arch/arm/cpu/armv7/mx5/lowlevel_init.S +++ b/arch/arm/cpu/armv7/mx5/lowlevel_init.S @@ -21,7 +21,7 @@ #include <config.h> #include <asm/arch/imx-regs.h> -#include <asm/arch/asm-offsets.h> +#include <generated/asm-offsets.h> /* * L2CC Cache setup/invalidation/disable diff --git a/arch/arm/include/asm/arch-mx25/macro.h b/arch/arm/include/asm/arch-mx25/macro.h index 276c71c..3b694da 100644 --- a/arch/arm/include/asm/arch-mx25/macro.h +++ b/arch/arm/include/asm/arch-mx25/macro.h @@ -31,7 +31,7 @@ #ifdef __ASSEMBLY__ #include <asm/arch/imx-regs.h> -#include <asm/arch/asm-offsets.h> +#include <generated/asm-offsets.h> .macro init_aips write32 IMX_AIPS1_BASE + AIPS_MPR_0_7, 0x77777777 |