diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-13 10:10:02 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-13 10:10:02 -0600 |
| commit | 6e90f62f5be07d7464336da2e79ca3d18dda04fa (patch) | |
| tree | 0beeefd92b545aa6718e05368b411139b6334de5 | |
| parent | edcf7fabf866e78fa927b6d31c6c82d6b1c7c6a4 (diff) | |
| download | px4-nuttx-6e90f62f5be07d7464336da2e79ca3d18dda04fa.tar.gz px4-nuttx-6e90f62f5be07d7464336da2e79ca3d18dda04fa.tar.bz2 px4-nuttx-6e90f62f5be07d7464336da2e79ca3d18dda04fa.zip | |
Tiva Timer: Rename tiva_timerlow.c to tiva_timerlow32.c since it only supports 32-bit periodic timers
| -rw-r--r-- | nuttx/arch/arm/src/tiva/Kconfig | 5 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/tiva/Make.defs | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_timerlow32.c (renamed from nuttx/arch/arm/src/tiva/tiva_timerlow.c) | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/nuttx/arch/arm/src/tiva/Kconfig b/nuttx/arch/arm/src/tiva/Kconfig index 1c1fa7ec4..2b61ae5dc 100644 --- a/nuttx/arch/arm/src/tiva/Kconfig +++ b/nuttx/arch/arm/src/tiva/Kconfig @@ -746,10 +746,6 @@ if TIVA_TIMER menu "Tiva Timer Configuration" -config TIVA_TIMER_DRIVER - bool - default n - config TIVA_TIMER_32BIT bool "32-bit timer support" default n @@ -759,7 +755,6 @@ if TIVA_TIMER_32BIT config TIVA_TIMER32_PERIODIC bool "32-bit one-shot/periodic timer support" default n - select TIVA_TIMER_DRIVER if TIMER config TIVA_TIMER32_RTC bool "32-bit RTC (needs 32.768-KHz input)" diff --git a/nuttx/arch/arm/src/tiva/Make.defs b/nuttx/arch/arm/src/tiva/Make.defs index d244c3a2f..3c49a6769 100644 --- a/nuttx/arch/arm/src/tiva/Make.defs +++ b/nuttx/arch/arm/src/tiva/Make.defs @@ -98,8 +98,8 @@ endif ifeq ($(CONFIG_TIVA_TIMER),y) CHIP_CSRCS += tiva_timerlib.c -ifeq ($(CONFIG_TIVA_TIMER_DRIVER),y) -CHIP_CSRCS += tiva_timerlow.c +ifeq ($(CONFIG_TIVA_TIMER32_PERIODIC),y) +CHIP_CSRCS += tiva_timerlow32.c endif endif diff --git a/nuttx/arch/arm/src/tiva/tiva_timerlow.c b/nuttx/arch/arm/src/tiva/tiva_timerlow32.c index 261421af4..d7711ad64 100644 --- a/nuttx/arch/arm/src/tiva/tiva_timerlow.c +++ b/nuttx/arch/arm/src/tiva/tiva_timerlow32.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/arm/src/tiva/tiva_timerlow.c + * arch/arm/src/tiva/tiva_timerlow32.c * * Copyright (C) 2015 Gregory Nutt. All rights reserved. * Authors: Gregory Nutt <gnutt@nuttx.org> |