summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/stm32
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-09 15:43:18 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-09-09 15:43:18 +0000
commit78c6aa16fdd3926e15fa16ebab33ea416031ac11 (patch)
tree9c993b977665a0c00e06690f81a26a760d61831a /nuttx/arch/arm/src/stm32
parent7d909957bf5f3b984d2be3779b02b55d7f42e4bb (diff)
downloadpx4-nuttx-78c6aa16fdd3926e15fa16ebab33ea416031ac11.tar.gz
px4-nuttx-78c6aa16fdd3926e15fa16ebab33ea416031ac11.tar.bz2
px4-nuttx-78c6aa16fdd3926e15fa16ebab33ea416031ac11.zip
Reconfigured Shenzhou to use JTAG. Misc Kconfig changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5118 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/stm32')
-rw-r--r--nuttx/arch/arm/src/stm32/Kconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index ef1ca63ce..80610f271 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -3,6 +3,8 @@
# see misc/tools/kconfig-language.txt.
#
+comment "STM32 Configuration Options"
+
choice
prompt "STM32 Chip Selection"
default ARCH_CHIP_STM32F103ZET6
@@ -414,6 +416,8 @@ config STM32_CAN
bool
default y if STM32_CAN1 || STM32_CAN2
+menu "Alternate Pin Mapping"
+
choice
prompt "TIM1 Alternate Pin Mappings"
depends on STM32_STM32F10XX && STM32_TIM1
@@ -537,6 +541,8 @@ config STM32_ETH_REMAP
default n
depends on STM32_CONNECTIVITYLINE && STM32_ETHMAC
+endmenu
+
choice
prompt "JTAG Configuration"
default STM32_JTAG_DISABLE