diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-10-11 10:19:04 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-11 10:19:04 +0200 |
| commit | e67f46286440a53fb1d693152667ea3b1a6b3060 (patch) | |
| tree | 3fdedda3a9122785e07e209ab6a5a0fc7fd65fd7 /arch/arm/cpu | |
| parent | bfc7bea6adc46e1db2f5a5e3464d7652ed67c864 (diff) | |
| parent | f8f8acd7249d224ed5f9704a5738c469b137bc8e (diff) | |
| download | u-boot-imx-e67f46286440a53fb1d693152667ea3b1a6b3060.zip u-boot-imx-e67f46286440a53fb1d693152667ea3b1a6b3060.tar.gz u-boot-imx-e67f46286440a53fb1d693152667ea3b1a6b3060.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-imx
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv7/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/omap-common/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/syslib.c (renamed from arch/arm/cpu/armv7/omap-common/syslib.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index ae20299..7743fef 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -27,6 +27,7 @@ LIB = $(obj)lib$(CPU).a START := start.o COBJS := cpu.o +COBJS += syslib.o SRCS := $(START:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) @@ -44,4 +45,4 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend -#########################################################################
\ No newline at end of file +######################################################################### diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile index caee726..aedea7b 100644 --- a/arch/arm/cpu/armv7/omap-common/Makefile +++ b/arch/arm/cpu/armv7/omap-common/Makefile @@ -28,7 +28,6 @@ LIB = $(obj)libomap-common.a SOBJS := reset.o COBJS := timer.o -COBJS += syslib.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/arch/arm/cpu/armv7/omap-common/syslib.c b/arch/arm/cpu/armv7/syslib.c index f9ed9a3..f9ed9a3 100644 --- a/arch/arm/cpu/armv7/omap-common/syslib.c +++ b/arch/arm/cpu/armv7/syslib.c |