diff options
| author | David Sidrane <david_s5@nscdg.com> | 2015-01-14 07:09:10 -1000 |
|---|---|---|
| committer | David Sidrane <david_s5@nscdg.com> | 2015-01-14 07:09:10 -1000 |
| commit | 695c2a774c53f5af4fb42607d360c39470e116c1 (patch) | |
| tree | d446ff320437fab2ad35168814cd100fba907da5 /nuttx-configs/px4fmu-v2 | |
| parent | c36e7d28b84526b90717c11f7b78646fe028c179 (diff) | |
| download | px4-firmware-695c2a774c53f5af4fb42607d360c39470e116c1.tar.gz px4-firmware-695c2a774c53f5af4fb42607d360c39470e116c1.tar.bz2 px4-firmware-695c2a774c53f5af4fb42607d360c39470e116c1.zip | |
updated to latest upstream
Diffstat (limited to 'nuttx-configs/px4fmu-v2')
| -rw-r--r-- | nuttx-configs/px4fmu-v2/Kconfig | 6 | ||||
| -rw-r--r-- | nuttx-configs/px4fmu-v2/nsh/defconfig | 13 |
2 files changed, 13 insertions, 6 deletions
diff --git a/nuttx-configs/px4fmu-v2/Kconfig b/nuttx-configs/px4fmu-v2/Kconfig index 44013bd73..f9f0c5e6a 100644 --- a/nuttx-configs/px4fmu-v2/Kconfig +++ b/nuttx-configs/px4fmu-v2/Kconfig @@ -9,14 +9,14 @@ config BOARD_HAS_PROBES bool "Board provides GPIO or other Hardware for signaling to timing analyze." default y ---help--- - This board provides GPIO FMU-CH1-6 as PROBE_1-6 to provide timing signals from selected drivers. + This board provides GPIO FMU-CH1-6 as PROBE_1-6 to provide timing signals from selected drivers. config BOARD_USE_PROBES bool "Enable the use the board provided GPIO FMU-CH1-6 as PROBE_1-6 to provide timing signals from selected drivers" default n depends on BOARD_HAS_PROBES - + ---help--- - Select to use GPIO FMU-CH1-6 to provide timing signals from selected drivers. + Select to use GPIO FMU-CH1-6 to provide timing signals from selected drivers. endif diff --git a/nuttx-configs/px4fmu-v2/nsh/defconfig b/nuttx-configs/px4fmu-v2/nsh/defconfig index 8495571d1..cc6e0cab8 100644 --- a/nuttx-configs/px4fmu-v2/nsh/defconfig +++ b/nuttx-configs/px4fmu-v2/nsh/defconfig @@ -476,11 +476,12 @@ CONFIG_ARCH_BOARD="px4fmu-v2" # CONFIG_NSH_MMCSDMINOR=0 CONFIG_NSH_MMCSDSLOTNO=0 -CONFIG_MMCSD_HAVE_SDIOWAIT_WRCOMPLETE=y + # # Board-Specific Options # CONFIG_BOARD_HAS_PROBES=y +# CONFIG_BOARD_USE_PROBES is not set # # RTOS Features @@ -635,12 +636,13 @@ CONFIG_MMCSD_NSLOTS=1 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y # CONFIG_MMCSD_MMCSUPPORT is not set # CONFIG_MMCSD_HAVECARDDETECT is not set -CONFIG_MMCSD_HAVE_SDIOWAIT_WRCOMPLETE=y # CONFIG_MMCSD_SPI is not set CONFIG_ARCH_HAVE_SDIO=y +CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE=y CONFIG_MMCSD_SDIO=y CONFIG_SDIO_PREFLIGHT=y # CONFIG_SDIO_MUXBUS is not set +CONFIG_MMCSD_SDIOWAIT_WRCOMPLETE=y # CONFIG_SDIO_BLOCKSETUP is not set CONFIG_MTD=y @@ -1092,9 +1094,10 @@ CONFIG_EXAMPLES_NSH=y # # Interpreters # -# CONFIG_INTERPRETERS_FICL is not set # CONFIG_INTERPRETERS_BAS is not set +# CONFIG_INTERPRETERS_FICL is not set # CONFIG_INTERPRETERS_PCODE is not set +# CONFIG_INTERPRETERS_MICROPYTHON is not set # # Network Utilities @@ -1323,6 +1326,10 @@ CONFIG_SYSTEM_SYSINFO=y CONFIG_SYSTEM_SYSINFO_STACKSIZE=1024 # +# Temperature +# + +# # VI Work-Alike Editor # # CONFIG_SYSTEM_VI is not set |