diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2015-02-11 18:07:03 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2015-02-11 18:07:03 -0600 |
commit | 24beb4b587947a7a81a97cfa227d93e6de5a7684 (patch) | |
tree | c58d85dcd63a18c1bb4553bf4ab5823cf9657547 /nuttx/configs/Kconfig | |
parent | e3257dea5121ebcf9640c2def6584ed1a0d74761 (diff) | |
parent | d000b0ac237cb6b17e3d355b55250c3ca7e9f2d6 (diff) | |
download | nuttx-24beb4b587947a7a81a97cfa227d93e6de5a7684.tar.gz nuttx-24beb4b587947a7a81a97cfa227d93e6de5a7684.tar.bz2 nuttx-24beb4b587947a7a81a97cfa227d93e6de5a7684.zip |
Merge commit 'd000b0ac237cb6b17e3d355b55250c3ca7e9f2d6'
Diffstat (limited to 'nuttx/configs/Kconfig')
-rw-r--r-- | nuttx/configs/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig index 9bbe76619..bee4cc74e 100644 --- a/nuttx/configs/Kconfig +++ b/nuttx/configs/Kconfig @@ -859,6 +859,14 @@ config ARCH_BOARD_TM4C123G_LAUNCHPAD ---help--- Tiva TM4C123G LaunchPad. +config ARCH_BOARD_TM4C1294_LAUNCHPAD + bool "Tiva EK-TM4C1294XL LaunchPad" + depends on ARCH_CHIP_TM4C1294NC + select ARCH_HAVE_LEDS + select ARCH_HAVE_BUTTONS + ---help--- + Tiva EK-TM4C1294XL LaunchPad. + config ARCH_BOARD_CC3200_LAUNCHPAD bool "Tiva CC3200 Launchpad" depends on ARCH_CHIP_CC3200 @@ -1132,6 +1140,7 @@ config ARCH_BOARD default "sure-pic32mx" if ARCH_BOARD_SUREPIC32MX default "teensy" if ARCH_BOARD_TEENSY default "tm4c123g-launchpad" if ARCH_BOARD_TM4C123G_LAUNCHPAD + default "tm4c1294-launchpad" if ARCH_BOARD_TM4C1294_LAUNCHPAD default "cc3200-launchpad" if ARCH_BOARD_CC3200_LAUNCHPAD default "twr-k60n512" if ARCH_BOARD_TWR_K60N512 default "ubw32" if ARCH_BOARD_UBW32 |