From f547c36df80854f664421cd0142189d441f7ff19 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 20 Jun 2015 09:28:13 -0400 Subject: [PATCH] arc: move arc timer to drivers/ Change-Id: If4dccbf3bbe67c89b69aed1d62025bf867405d22 Signed-off-by: Anas Nashif --- arch/arc/Makefile | 2 -- arch/arc/timer/Makefile | 4 ---- drivers/timer/Kconfig | 8 ++++++++ drivers/timer/Makefile | 1 + {arch/arc => drivers}/timer/arcv2_timer0.c | 0 5 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 arch/arc/timer/Makefile rename {arch/arc => drivers}/timer/arcv2_timer0.c (100%) diff --git a/arch/arc/Makefile b/arch/arc/Makefile index ec9faad7d98..268cf6c2d4d 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -1,6 +1,4 @@ obj-y = core/ obj-y += bsp/ -obj-y += timer/ obj-$(CONFIG_NSIM) += serial/ -obj-y += timer/ diff --git a/arch/arc/timer/Makefile b/arch/arc/timer/Makefile deleted file mode 100644 index 86b673c8dfc..00000000000 --- a/arch/arc/timer/Makefile +++ /dev/null @@ -1,4 +0,0 @@ -ccflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_BSP_DIR)) -asflags-y +=-I$(srctree)/arch/arc/$(strip $(CONFIG_BSP_DIR)) - -obj-y += arcv2_timer0.o diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index 1fc5ec3ae9e..a4dfd95c341 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -62,4 +62,12 @@ config PIT help This option selects legacy i8253 timer as system timer. +config ARCV2_TIMER + bool "ARC Timer" + default y + depends on ARC + help + This module implements a kernel device driver for the ARCv2 processor timer 0 + and provides the standard "system clock driver" interfaces. + endmenu diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index fd65531a9d7..e9f73ca77fb 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -4,3 +4,4 @@ ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(subst $(DQUOTE),,$(CONFIG_BSP_DIR)) obj-$(CONFIG_PIT) = i8253.o obj-$(CONFIG_HPET_TIMER) += hpet.o obj-$(CONFIG_LOAPIC_TIMER) += loapic_timer.o +obj-$(CONFIG_ARCV2_TIMER) += arcv2_timer0.o diff --git a/arch/arc/timer/arcv2_timer0.c b/drivers/timer/arcv2_timer0.c similarity index 100% rename from arch/arc/timer/arcv2_timer0.c rename to drivers/timer/arcv2_timer0.c