summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-01-12 10:14:48 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-01-12 10:14:48 -0600
commit03db209bd059f62b68f642476dee0abd37fc402b (patch)
treec4bcead089be43db26d42f659209c52c95cb9510
parent3e2812c14422da36153cdd4a16a5c38b72600563 (diff)
downloadnuttx-master.tar.gz
nuttx-master.tar.bz2
nuttx-master.zip
Tiva Interrupts: Changes corresponding to the last needed in the Tiva Kconfig file as wellHEADmaster
-rw-r--r--nuttx/arch/arm/include/tiva/irq.h4
-rw-r--r--nuttx/arch/arm/src/tiva/Kconfig9
2 files changed, 10 insertions, 3 deletions
diff --git a/nuttx/arch/arm/include/tiva/irq.h b/nuttx/arch/arm/include/tiva/irq.h
index 7606f7abb..5c7b5fa70 100644
--- a/nuttx/arch/arm/include/tiva/irq.h
+++ b/nuttx/arch/arm/include/tiva/irq.h
@@ -64,7 +64,7 @@
# undef CONFIG_TIVA_GPIOP_IRQS /* P-Q */
# undef CONFIG_TIVA_GPIOQ_IRQS
-/* The TM4C123GH6PGE supports interrupts on port P */
+/* The TM4C123GH6PGE supports interrupts only on port P */
# elif defined(CONFIG_ARCH_CHIP_TM4C123GH6PGE)
# undef CONFIG_TIVA_GPIOA_IRQS /* A-F */
@@ -76,7 +76,7 @@
# undef CONFIG_TIVA_GPIOQ_IRQS /* Q */
-/* The TM4C123GH6ZRB and the TM4C129x support interrupts only on ports P and Q. */
+/* The TM4C123GH6ZRB and the TM4C129x support interrupts only on ports P and Q. */
# else
# undef CONFIG_TIVA_GPIOA_IRQS /* A-F */
diff --git a/nuttx/arch/arm/src/tiva/Kconfig b/nuttx/arch/arm/src/tiva/Kconfig
index 319720151..59f045c7b 100644
--- a/nuttx/arch/arm/src/tiva/Kconfig
+++ b/nuttx/arch/arm/src/tiva/Kconfig
@@ -75,6 +75,7 @@ config ARCH_CHIP_TM4C123GH6ZRB
depends on ARCH_CHIP_TIVA
select ARCH_CHIP_TM4C
select ARCH_CHIP_TM4C123
+ select TIVA_HAVE_GPIOP_IRQS
select TIVA_HAVE_GPIOQ_IRQS
select TIVA_HAVE_I2C4
select TIVA_HAVE_I2C5
@@ -84,6 +85,12 @@ config ARCH_CHIP_TM4C123GH6PMI
depends on ARCH_CHIP_TIVA
select ARCH_CHIP_TM4C
select ARCH_CHIP_TM4C123
+ select TIVA_HAVE_GPIOA_IRQS
+ select TIVA_HAVE_GPIOB_IRQS
+ select TIVA_HAVE_GPIOC_IRQS
+ select TIVA_HAVE_GPIOD_IRQS
+ select TIVA_HAVE_GPIOE_IRQS
+ select TIVA_HAVE_GPIOF_IRQS
config ARCH_CHIP_TM4C1294NC
bool "TM4C1294NC"
@@ -151,6 +158,7 @@ config ARCH_CHIP_TM4C123
config ARCH_CHIP_TM4C129
bool
+ select TIVA_HAVE_GPIOP_IRQS
select TIVA_HAVE_GPIOQ_IRQS
select TIVA_HAVE_I2C4
select TIVA_HAVE_I2C5
@@ -165,7 +173,6 @@ config ARCH_CHIP_TM4C
bool
select ARCH_CORTEXM4
select ARCH_HAVE_FPU
- select TIVA_HAVE_GPIOP_IRQS
select TIVA_HAVE_I2C1
select TIVA_HAVE_I2C2
select TIVA_HAVE_I2C3