diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-06-30 08:09:19 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-06-30 08:09:19 -0600 |
| commit | a0efe59596d5bc7b9098d4a3aff3d9b610cfbd10 (patch) | |
| tree | 846787786b17c164f159f08c07fd156ecd4bd824 | |
| parent | 8e09f670c055c55ef865b74d25a77b47c1cf6267 (diff) | |
| download | px4-nuttx-a0efe59596d5bc7b9098d4a3aff3d9b610cfbd10.tar.gz px4-nuttx-a0efe59596d5bc7b9098d4a3aff3d9b610cfbd10.tar.bz2 px4-nuttx-a0efe59596d5bc7b9098d4a3aff3d9b610cfbd10.zip | |
STM32: Move temperature ranges from chip selection configuration prompts. From Kosma Moczek
| -rw-r--r-- | nuttx/arch/arm/include/stm32/chip.h | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/Kconfig | 15 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/chip.h | 5 |
3 files changed, 15 insertions, 7 deletions
diff --git a/nuttx/arch/arm/include/stm32/chip.h b/nuttx/arch/arm/include/stm32/chip.h index 5a2486da5..b8b14679f 100644 --- a/nuttx/arch/arm/include/stm32/chip.h +++ b/nuttx/arch/arm/include/stm32/chip.h @@ -685,7 +685,7 @@ * differ only in the available FLASH and SRAM. */ -#elif defined(CONFIG_ARCH_CHIP_STM32F103RE) +#elif defined(CONFIG_ARCH_CHIP_STM32F103RD) || defined(CONFIG_ARCH_CHIP_STM32F103RE) # undef CONFIG_STM32_STM32L15XX /* STM32L151xx and STM32L152xx family */ # undef CONFIG_STM32_ENERGYLITE /* STM32L EnergyLite family */ # define CONFIG_STM32_STM32F10XX 1 /* STM32F10xxx family */ diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig index 47d3a93b4..13ec016a7 100644 --- a/nuttx/arch/arm/src/stm32/Kconfig +++ b/nuttx/arch/arm/src/stm32/Kconfig @@ -321,29 +321,36 @@ config ARCH_CHIP_STM32F103VB select STM32_PERFORMANCELINE select STM32_MEDIUMDENSITY +config ARCH_CHIP_STM32F103RD + bool "STM32F103RD" + select ARCH_CORTEXM3 + select STM32_STM32F10XX + select STM32_PERFORMANCELINE + select STM32_HIGHDENSITY + config ARCH_CHIP_STM32F103RE - bool "STM32F103RET6" + bool "STM32F103RE" select ARCH_CORTEXM3 select STM32_STM32F10XX select STM32_PERFORMANCELINE select STM32_HIGHDENSITY config ARCH_CHIP_STM32F103VC - bool "STM32F103VCT6" + bool "STM32F103VC" select ARCH_CORTEXM3 select STM32_STM32F10XX select STM32_PERFORMANCELINE select STM32_HIGHDENSITY config ARCH_CHIP_STM32F103VE - bool "STM32F103VET6" + bool "STM32F103VE" select ARCH_CORTEXM3 select STM32_STM32F10XX select STM32_PERFORMANCELINE select STM32_HIGHDENSITY config ARCH_CHIP_STM32F103ZE - bool "STM32F103ZET6" + bool "STM32F103ZE" select ARCH_CORTEXM3 select STM32_STM32F10XX select STM32_PERFORMANCELINE diff --git a/nuttx/arch/arm/src/stm32/chip.h b/nuttx/arch/arm/src/stm32/chip.h index 6d304ad12..40c6a3a05 100644 --- a/nuttx/arch/arm/src/stm32/chip.h +++ b/nuttx/arch/arm/src/stm32/chip.h @@ -80,8 +80,9 @@ * only in the available FLASH and SRAM. */ -# elif defined(CONFIG_ARCH_CHIP_STM32F103RE) || \ - defined(CONFIG_ARCH_CHIP_STM32F103RB) +# elif defined(CONFIG_ARCH_CHIP_STM32F103RB) || \ + defined(CONFIG_ARCH_CHIP_STM32F103RD) || \ + defined(CONFIG_ARCH_CHIP_STM32F103RE) # include "chip/stm32f103r_pinmap.h" /* STM32F103VC, STM32F103VD, and STM32F103VE are all provided in 100 pin packages and differ |