commit 1d17de6703af21820659d86d528e74e78fde9765
author Albert ARIBAUD <albert.u.boot@aribaud.net> Tue Dec 10 14:31:56 2013 +0100
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Tue Dec 10 22:23:59 2013 +0100
tree 57d78f1ee94a2060eaa591533278d2934d4f1da3
parent 5be325724459db11180b0ccc91eda0cef85aa72d
parent ca3cd8217caaede6ad1d6575f8ccb315b884aa9b

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
	arch/arm/cpu/armv7/rmobile/Makefile
	doc/README.scrapyard

Needed manual fix:
	arch/arm/cpu/armv7/omap-common/Makefile
	board/compulab/cm_t335/u-boot.lds

arch/arm/cpu/armv7/omap-common/Makefile

diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 679c1a1..59f5352 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -18,7 +18,7 @@
 endif
 
 ifneq ($(CONFIG_OMAP54XX),)
-COBJS	+= pipe3-phy.o
+obj-y	+= pipe3-phy.o
 obj-$(CONFIG_SCSI_AHCI_PLAT) += sata.o
 endif