summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2012-11-15 01:21:18 +0000
committerTom Rini <trini@ti.com>2012-12-10 08:55:25 -0700
commitc7f1cf5f29713e81f866063cdf7268c1cfc673ff (patch)
tree9a21655728414fa8b0b42388c22c4420bc8c2469 /arch/arm
parentf281f299df5d6831c34c21478815f66aebb2f00f (diff)
downloadu-boot-imx-c7f1cf5f29713e81f866063cdf7268c1cfc673ff.zip
u-boot-imx-c7f1cf5f29713e81f866063cdf7268c1cfc673ff.tar.gz
u-boot-imx-c7f1cf5f29713e81f866063cdf7268c1cfc673ff.tar.bz2
OMAP: Tweak omap-common/Makefile since reset.S -> reset.c
Git commit d417d1db5f9092d125ddea882ced77eaa5f3d236 replaced the omap-common file reset.S with reset.c, but the Makefile was not adjusted for that. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/cpu/armv7/omap-common/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 1f2fa02..0efc80d 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -25,9 +25,8 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libomap-common.o
-SOBJS := reset.o
-
-COBJS := timer.o
+COBJS := reset.o
+COBJS += timer.o
COBJS += utils.o
ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)