diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 09:25:36 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-05-11 09:25:36 +0200 |
commit | ec7023db8dc95966919589541f1ca09355a3f7a5 (patch) | |
tree | 69be08a0b3f19e3e1d99ea7829931f8f800a01d9 /arch/arm/cpu/arm1136/mx35/Makefile | |
parent | e825b100d209a9d3c79b2998452cafa94eec986a (diff) | |
parent | d782c1fe7246301143ed78c0d86ea6c81f9325f9 (diff) | |
download | blackbird-obmc-uboot-ec7023db8dc95966919589541f1ca09355a3f7a5.tar.gz blackbird-obmc-uboot-ec7023db8dc95966919589541f1ca09355a3f7a5.zip |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Conflicts:
drivers/mtd/nand/mxc_nand_spl.c
include/configs/m28evk.h
Diffstat (limited to 'arch/arm/cpu/arm1136/mx35/Makefile')
-rw-r--r-- | arch/arm/cpu/arm1136/mx35/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm1136/mx35/Makefile b/arch/arm/cpu/arm1136/mx35/Makefile index f4ababbe5b..23adac088d 100644 --- a/arch/arm/cpu/arm1136/mx35/Makefile +++ b/arch/arm/cpu/arm1136/mx35/Makefile @@ -29,7 +29,6 @@ LIB = $(obj)lib$(SOC).o COBJS += generic.o COBJS += timer.o -COBJS += iomux.o COBJS += mx35_sdram.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) |