aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChandan Nath <chandan.nath@ti.com>2011-10-14 02:58:25 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-10-27 21:56:36 +0200
commitf0f4b5ff50b1ee8db5caceed6bbf464880e33274 (patch)
tree5093671156ecc0c4f850123520f1bc51cb8a69f3
parent62d7fe7c91d9da43c8164c7baa9b2331a18d9ee0 (diff)
ARM:AM33XX: Added timer support
This patch adds timer support for AM33xx platform. Signed-off-by: Chandan Nath <chandan.nath@ti.com> Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
-rw-r--r--Makefile3
-rw-r--r--arch/arm/cpu/armv7/omap-common/Makefile2
2 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 684cdb6aa..9ef33f9fd 100644
--- a/Makefile
+++ b/Makefile
@@ -289,6 +289,9 @@ LIBS += lib/libfdt/libfdt.o
LIBS += api/libapi.o
LIBS += post/libpost.o
+ifeq ($(SOC),am33xx)
+LIBS += $(CPUDIR)/omap-common/libomap-common.o
+endif
ifeq ($(SOC),omap3)
LIBS += $(CPUDIR)/omap-common/libomap-common.o
endif
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 0b96b4789..1dee81f22 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -29,7 +29,9 @@ SOBJS := reset.o
COBJS := timer.o
COBJS += utils.o
+ifdef CONFIG_OMAP
COBJS += gpio.o
+endif
ifdef CONFIG_SPL_BUILD
COBJS += spl.o