From 0c6df13a4ce2b141976e77f8afeaefbf302da13c Mon Sep 17 00:00:00 2001 From: raiden00pl Date: Fri, 17 May 2019 11:41:16 +0000 Subject: [PATCH] Merged in raiden00/nuttx_stm32 (pull request #871) arch/arm/src/stm32/Kconfig: simplify ARCH_HAVE_FPU selection and remove redundant options for F207 Approved-by: Gregory Nutt --- arch/arm/src/stm32/Kconfig | 161 ++++++++----------------------------- 1 file changed, 34 insertions(+), 127 deletions(-) diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig index a9e9b5cac0..17e65fc8e1 100644 --- a/arch/arm/src/stm32/Kconfig +++ b/arch/arm/src/stm32/Kconfig @@ -566,45 +566,38 @@ config ARCH_CHIP_STM32F302K6 bool "STM32F302K6" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU select STM32_HAVE_I2C3 config ARCH_CHIP_STM32F302K8 bool "STM32F302K8" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU select STM32_HAVE_I2C3 config ARCH_CHIP_STM32F302C6 bool "STM32F302C6" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F302C8 bool "STM32F302C8" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F302R6 bool "STM32F302R6" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F302R8 bool "STM32F302R8" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F302CB bool "STM32F302CB" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU select STM32_HAVE_ADC2 select STM32_HAVE_USART3 @@ -612,7 +605,6 @@ config ARCH_CHIP_STM32F302CC bool "STM32F302CC" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU select STM32_HAVE_ADC2 select STM32_HAVE_USART3 @@ -620,7 +612,6 @@ config ARCH_CHIP_STM32F302RB bool "STM32F302RB" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU select STM32_HAVE_ADC2 select STM32_HAVE_USART3 select STM32_HAVE_UART4 @@ -630,7 +621,6 @@ config ARCH_CHIP_STM32F302RC bool "STM32F302RC" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU select STM32_HAVE_ADC2 select STM32_HAVE_USART3 select STM32_HAVE_UART4 @@ -640,7 +630,6 @@ config ARCH_CHIP_STM32F302VB bool "STM32F302VB" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU select STM32_HAVE_ADC2 select STM32_HAVE_USART3 select STM32_HAVE_UART4 @@ -650,7 +639,6 @@ config ARCH_CHIP_STM32F302VC bool "STM32F302VC" select STM32_STM32F30XX select STM32_STM32F302 - select ARCH_HAVE_FPU select STM32_HAVE_ADC2 select STM32_HAVE_USART3 select STM32_HAVE_UART4 @@ -660,21 +648,18 @@ config ARCH_CHIP_STM32F303K6 bool "STM32F303K6" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_DAC2 config ARCH_CHIP_STM32F303K8 bool "STM32F303K8" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_DAC2 config ARCH_CHIP_STM32F303C6 bool "STM32F303C6" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_DAC2 select STM32_HAVE_USART3 @@ -682,7 +667,6 @@ config ARCH_CHIP_STM32F303C8 bool "STM32F303C8" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_DAC2 select STM32_HAVE_USART3 @@ -690,7 +674,6 @@ config ARCH_CHIP_STM32F303CB bool "STM32F303CB" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_I2C2 @@ -705,7 +688,6 @@ config ARCH_CHIP_STM32F303CC bool "STM32F303CC" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_I2C2 @@ -720,7 +702,6 @@ config ARCH_CHIP_STM32F303RB bool "STM32F303RB" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_I2C2 @@ -737,7 +718,6 @@ config ARCH_CHIP_STM32F303RC bool "STM32F303RC" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_I2C2 @@ -754,7 +734,6 @@ config ARCH_CHIP_STM32F303RD bool "STM32F303RD" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_I2C2 @@ -773,7 +752,6 @@ config ARCH_CHIP_STM32F303RE bool "STM32F303RE" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_I2C2 @@ -792,7 +770,6 @@ config ARCH_CHIP_STM32F303VB bool "STM32F303VB" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_I2C2 @@ -809,7 +786,6 @@ config ARCH_CHIP_STM32F303VC bool "STM32F303VC" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_I2C2 @@ -826,7 +802,6 @@ config ARCH_CHIP_STM32F303RD bool "STM32F303RD" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_USART3 @@ -835,7 +810,6 @@ config ARCH_CHIP_STM32F303RE bool "STM32F303RE" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_USART3 @@ -844,7 +818,6 @@ config ARCH_CHIP_STM32F303VD bool "STM32F303VD" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_USART3 @@ -853,7 +826,6 @@ config ARCH_CHIP_STM32F303VE bool "STM32F303VE" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_USART3 @@ -862,7 +834,6 @@ config ARCH_CHIP_STM32F303ZD bool "STM32F303ZD" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_USART3 @@ -871,7 +842,6 @@ config ARCH_CHIP_STM32F303ZE bool "STM32F303ZE" select STM32_STM32F30XX select STM32_STM32F303 - select ARCH_HAVE_FPU select STM32_HAVE_ADC3 select STM32_HAVE_ADC4 select STM32_HAVE_USART3 @@ -879,137 +849,110 @@ config ARCH_CHIP_STM32F303ZE config ARCH_CHIP_STM32F334K4 bool "STM32F334K4" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F334K6 bool "STM32F334K6" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F334K8 bool "STM32F334K8" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F334C4 bool "STM32F334C4" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F334C6 bool "STM32F334C6" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F334C8 bool "STM32F334C8" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F334R4 bool "STM32F334R4" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F334R6 bool "STM32F334R6" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F334R8 bool "STM32F334R8" select STM32_STM32F33XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372C8 bool "STM32F372C8" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372R8 bool "STM32F372R8" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372V8 bool "STM32F372V8" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372CB bool "STM32F372CB" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372RB bool "STM32F372RB" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372VB bool "STM32F372VB" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372CC bool "STM32F372CC" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372RC bool "STM32F372RC" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F372VC bool "STM32F372VC" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373C8 bool "STM32F373C8" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373R8 bool "STM32F373R8" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373V8 bool "STM32F373V8" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373CB bool "STM32F373CB" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373RB bool "STM32F373RB" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373VB bool "STM32F373VB" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373CC bool "STM32F373CC" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373RC bool "STM32F373RC" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F373VC bool "STM32F373VC" select STM32_STM32F37XX - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F401CB bool "STM32F401CB" @@ -1063,171 +1006,143 @@ config ARCH_CHIP_STM32F410RB bool "STM32F410RB" select STM32_STM32F4XXX select STM32_STM32F410 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F411RE bool "STM32F411RE" select STM32_STM32F4XXX select STM32_STM32F411 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F411VE bool "STM32F411VE" select STM32_STM32F4XXX select STM32_STM32F411 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F405RG bool "STM32F405RG" select STM32_STM32F4XXX select STM32_STM32F405 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F405VG bool "STM32F405VG" select STM32_STM32F4XXX select STM32_STM32F405 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F405ZG bool "STM32F405ZG" select STM32_STM32F4XXX select STM32_STM32F405 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407VE bool "STM32F407VE" select STM32_STM32F4XXX select STM32_STM32F407 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407VG bool "STM32F407VG" select STM32_STM32F4XXX select STM32_STM32F407 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407ZE bool "STM32F407ZE" select STM32_STM32F4XXX select STM32_STM32F407 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407ZG bool "STM32F407ZG" select STM32_STM32F4XXX select STM32_STM32F407 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407IE bool "STM32F407IE" select STM32_STM32F4XXX select STM32_STM32F407 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407IG bool "STM32F407IG" select STM32_STM32F4XXX select STM32_STM32F407 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F427V bool "STM32F427V" select STM32_STM32F4XXX select STM32_STM32F427 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F427Z bool "STM32F427Z" select STM32_STM32F4XXX select STM32_STM32F427 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F427I bool "STM32F427I" select STM32_STM32F4XXX select STM32_STM32F427 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F429V bool "STM32F429V" select STM32_STM32F4XXX select STM32_STM32F429 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F429Z bool "STM32F429Z" select STM32_STM32F4XXX select STM32_STM32F429 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F429I bool "STM32F429I" select STM32_STM32F4XXX select STM32_STM32F429 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F429B bool "STM32F429B" select STM32_STM32F4XXX select STM32_STM32F429 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F429N bool "STM32F429N" select STM32_STM32F4XXX select STM32_STM32F429 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F446M bool "STM32F446M" select STM32_STM32F4XXX select STM32_STM32F446 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F446R bool "STM32F446R" select STM32_STM32F4XXX select STM32_STM32F446 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F446V bool "STM32F446V" select STM32_STM32F4XXX select STM32_STM32F446 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F446Z bool "STM32F446Z" select STM32_STM32F4XXX select STM32_STM32F446 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F469A bool "STM32F469A" select STM32_STM32F4XXX select STM32_STM32F469 - select ARCH_HAVE_FPU config ARCH_CHIP_STM32F469I bool "STM32F469I" select STM32_STM32F4XXX select STM32_STM32F469 - select ARCH_HAVE_FPU select STM32_HAVE_ETHMAC config ARCH_CHIP_STM32F469B bool "STM32F469B" select STM32_STM32F4XXX select STM32_STM32F469 - select ARCH_HAVE_FPU select STM32_HAVE_ETHMAC config ARCH_CHIP_STM32F469N bool "STM32F469N" select STM32_STM32F4XXX select STM32_STM32F469 - select ARCH_HAVE_FPU select STM32_HAVE_ETHMAC endchoice @@ -1455,15 +1370,7 @@ config STM32_STM32F20XX bool default n select ARCH_CORTEXM3 - select STM32_HAVE_IOCOMPENSATION - select STM32_HAVE_IP_TIMERS_V1 - select STM32_HAVE_IP_ADC_V1 - select STM32_HAVE_IP_DMA_V2 - select STM32_HAVE_IP_I2C_V1 - -config STM32_STM32F205 - bool - default n + select STM32_HAVE_CRYP select STM32_HAVE_OTGFS select STM32_HAVE_OTGHS select STM32_HAVE_USART3 @@ -1485,53 +1392,35 @@ config STM32_STM32F205 select STM32_HAVE_TIM14 select STM32_HAVE_ADC2 select STM32_HAVE_ADC3 - select STM32_HAVE_CAN1 - select STM32_HAVE_CAN2 select STM32_HAVE_DAC1 select STM32_HAVE_I2C2 select STM32_HAVE_I2C3 + select STM32_HAVE_CAN1 + select STM32_HAVE_CAN2 select STM32_HAVE_RNG select STM32_HAVE_SPI2 select STM32_HAVE_SPI3 + select STM32_HAVE_IOCOMPENSATION + select STM32_HAVE_IP_TIMERS_V1 + select STM32_HAVE_IP_ADC_V1 + select STM32_HAVE_IP_DMA_V2 + select STM32_HAVE_IP_I2C_V1 + +config STM32_STM32F205 + bool + default n config STM32_STM32F207 bool default n - select STM32_HAVE_OTGFS select STM32_HAVE_FSMC - select STM32_HAVE_USART3 - select STM32_HAVE_UART4 - select STM32_HAVE_UART5 - select STM32_HAVE_USART6 - select STM32_HAVE_TIM1 - select STM32_HAVE_TIM3 - select STM32_HAVE_TIM4 - select STM32_HAVE_TIM5 - select STM32_HAVE_TIM6 - select STM32_HAVE_TIM7 - select STM32_HAVE_TIM8 - select STM32_HAVE_TIM9 - select STM32_HAVE_TIM10 - select STM32_HAVE_TIM11 - select STM32_HAVE_TIM12 - select STM32_HAVE_TIM13 - select STM32_HAVE_TIM14 - select STM32_HAVE_ADC2 - select STM32_HAVE_ADC3 - select STM32_HAVE_CAN1 - select STM32_HAVE_CAN2 - select STM32_HAVE_DAC1 - select STM32_HAVE_I2C2 - select STM32_HAVE_I2C3 - select STM32_HAVE_RNG select STM32_HAVE_ETHMAC - select STM32_HAVE_SPI2 - select STM32_HAVE_SPI3 config STM32_STM32F30XX bool default n select ARCH_CORTEXM4 + select ARCH_HAVE_FPU select STM32_HAVE_ADC1_DMA select STM32_HAVE_CAN1 select STM32_HAVE_DAC1 @@ -1541,6 +1430,7 @@ config STM32_STM32F30XX select STM32_HAVE_TIM15 select STM32_HAVE_TIM16 select STM32_HAVE_TIM17 + select STM32_HAVE_TSC select STM32_HAVE_IP_TIMERS_V2 select STM32_HAVE_IP_ADC_V2 select STM32_HAVE_IP_DMA_V1 @@ -1569,6 +1459,7 @@ config STM32_STM32F33XX bool default n select ARCH_CORTEXM4 + select ARCH_HAVE_FPU select STM32_HAVE_HRTIM1 select STM32_HAVE_COMP2 select STM32_HAVE_COMP4 @@ -1581,6 +1472,7 @@ config STM32_STM32F33XX select STM32_HAVE_TIM15 select STM32_HAVE_TIM16 select STM32_HAVE_TIM17 + select STM32_HAVE_TSC select STM32_HAVE_ADC2 select STM32_HAVE_ADC1_DMA select STM32_HAVE_ADC2_DMA @@ -1597,6 +1489,7 @@ config STM32_STM32F37XX bool default n select ARCH_CORTEXM4 + select ARCH_HAVE_FPU select STM32_HAVE_USBDEV select STM32_HAVE_TIM3 select STM32_HAVE_TIM4 @@ -1606,6 +1499,7 @@ config STM32_STM32F37XX select STM32_HAVE_TIM15 select STM32_HAVE_TIM16 select STM32_HAVE_TIM17 + select STM32_HAVE_TSC select STM32_HAVE_SDADC1 select STM32_HAVE_SDADC2 select STM32_HAVE_SDADC3 @@ -1625,6 +1519,8 @@ config STM32_STM32F4XXX bool default n select ARCH_CORTEXM4 + select ARCH_HAVE_FPU + select STM32_HAVE_CRYP select STM32_HAVE_SPI2 select STM32_HAVE_I2C2 select STM32_HAVE_IOCOMPENSATION @@ -1647,7 +1543,6 @@ config STM32_STM32F401 bool default n select ARCH_CORTEXM4 - select ARCH_HAVE_FPU select STM32_STM32F4XXX select STM32_HAVE_USART6 select STM32_HAVE_TIM1 @@ -1939,6 +1834,14 @@ menu "STM32 Peripheral Support" # These "hidden" settings determine is a peripheral option is available for the # selection MCU +config STM32_HAVE_AES + bool + default n + +config STM32_HAVE_CRYP + bool + default n + config STM32_HAVE_CCM bool default n @@ -2059,6 +1962,10 @@ config STM32_HAVE_TIM17 bool default n +config STM32_HAVE_TSC + bool + default n + config STM32_HAVE_ADC2 bool default n @@ -2405,7 +2312,7 @@ config STM32_CRC config STM32_CRYP bool "CRYP" default n - depends on STM32_STM32F20XX || STM32_STM32F4XXX + depends on STM32_HAVE_CRYP config STM32_DMA1 bool "DMA1" @@ -2778,7 +2685,7 @@ config STM32_TIM17 config STM32_TSC bool "TSC" default n - depends on STM32_STM32F30XX + depends on STM32_HAVE_TSC config STM32_USART1 bool "USART1"