summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/armv7/am33xx/Makefile
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-05-24 07:50:00 (GMT)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2014-05-24 07:50:00 (GMT)
commit33144ea443c298ac9d6f04926a02881a5bae91a3 (patch)
tree8d29378ecf90192f3f0f0637db89e0044d9c94cf /arch/arm/cpu/armv7/am33xx/Makefile
parent3eb5e198632dcc3e03b5742d1e0ebced0ef2f551 (diff)
parent39338a30fab2ce7d80dfe0d457071573727f499f (diff)
downloadu-boot-fsl-qoriq-33144ea443c298ac9d6f04926a02881a5bae91a3.tar.xz
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/am33xx/Makefile')
-rw-r--r--arch/arm/cpu/armv7/am33xx/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/am33xx/Makefile b/arch/arm/cpu/armv7/am33xx/Makefile
index 5566310..aae3f09 100644
--- a/arch/arm/cpu/armv7/am33xx/Makefile
+++ b/arch/arm/cpu/armv7/am33xx/Makefile
@@ -14,7 +14,6 @@ endif
obj-$(CONFIG_TI816X) += clock_ti816x.o
obj-y += sys_info.o
-obj-y += mem.o
obj-y += ddr.o
obj-y += emif4.o
obj-y += board.o