From d5f926fb4d5debf837cd53683bc55d836db6a1fe Mon Sep 17 00:00:00 2001 From: Peter Mitsis Date: Wed, 24 Jun 2015 12:30:59 -0400 Subject: [PATCH] Relocate Cortex-M timer driver Moves the Cortex-M timer driver so that it resides with the other timer drivers. Change-Id: I3324c53356efd9f5fd88752a98e4ae301ea38d47 Signed-off-by: Peter Mitsis --- arch/arm/Makefile | 1 - arch/arm/timer/Makefile | 5 ----- drivers/timer/Makefile | 4 ++++ {arch/arm => drivers}/timer/cortex_m_timer.c | 0 {arch/arm => drivers}/timer/cortex_m_timer_gdb.S | 0 5 files changed, 4 insertions(+), 6 deletions(-) delete mode 100644 arch/arm/timer/Makefile rename {arch/arm => drivers}/timer/cortex_m_timer.c (100%) rename {arch/arm => drivers}/timer/cortex_m_timer_gdb.S (100%) diff --git a/arch/arm/Makefile b/arch/arm/Makefile index b094d7759f5..8f2510d76e4 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -1,6 +1,5 @@ obj-y = core/ obj-y += bsp/ -obj-y += timer/ obj-$(CONFIG_BSP_FSL_FRDM_K64F) += fsl_frdm_k64f/ obj-$(CONFIG_BSP_TI_LM3S6965) += ti_lm3s6965/ diff --git a/arch/arm/timer/Makefile b/arch/arm/timer/Makefile deleted file mode 100644 index 097c38cae74..00000000000 --- a/arch/arm/timer/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -ccflags-y +=-I$(srctree)/include/drivers -ccflags-y +=-I$(srctree)/arch/$(ARCH)/$(strip $(CONFIG_PLATFORM)) - -obj-y = cortex_m_timer.o -obj-$(CONFIG_GDB_INFO) += cortex_m_timer_gdb.o diff --git a/drivers/timer/Makefile b/drivers/timer/Makefile index 9ffa321be27..1840e1508f8 100644 --- a/drivers/timer/Makefile +++ b/drivers/timer/Makefile @@ -5,3 +5,7 @@ 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 + +_CORTEX_M_TIMER_AND_GDB_INFO_yy = y +obj-$(CONFIG_CORTEX_M_TIMER) += cortex_m_timer.o +obj-$(_CORTEX_M_TIMER_AND_GDB_INFO_$(CONFIG_CORTEX_M_TIMER)$(CONFIG_GDB_INFO)) += cortex_m_timer_gdb.o diff --git a/arch/arm/timer/cortex_m_timer.c b/drivers/timer/cortex_m_timer.c similarity index 100% rename from arch/arm/timer/cortex_m_timer.c rename to drivers/timer/cortex_m_timer.c diff --git a/arch/arm/timer/cortex_m_timer_gdb.S b/drivers/timer/cortex_m_timer_gdb.S similarity index 100% rename from arch/arm/timer/cortex_m_timer_gdb.S rename to drivers/timer/cortex_m_timer_gdb.S