diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-30 16:12:36 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-30 16:12:36 -0600 |
commit | 61e164b9853560f78635463442bd9fcc8fe2fc04 (patch) | |
tree | d83c8e5d60e475d25297cf1d46eb5e16c43ffd25 | |
parent | 105b3699b86776e0aecc57aa69dcb6dd7f2a69a7 (diff) | |
download | nuttx-61e164b9853560f78635463442bd9fcc8fe2fc04.tar.gz nuttx-61e164b9853560f78635463442bd9fcc8fe2fc04.tar.bz2 nuttx-61e164b9853560f78635463442bd9fcc8fe2fc04.zip |
Fix configuration for F401: It has has FSMC and so the option should not be offered. But there are many more options available for the F401 that should be availalbe: CAN, nonexistent timers, etc. These will all need to be addressed
-rw-r--r-- | nuttx/arch/arm/src/stm32/Kconfig | 32 | ||||
-rw-r--r-- | nuttx/configs/nucleo-f401re/nsh/defconfig | 17 |
2 files changed, 37 insertions, 12 deletions
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig index 70c62e7bd..714a87ce0 100644 --- a/nuttx/arch/arm/src/stm32/Kconfig +++ b/nuttx/arch/arm/src/stm32/Kconfig @@ -444,54 +444,63 @@ config ARCH_CHIP_STM32F405RG bool "STM32F405RG" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F405 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F405VG bool "STM32F405VG" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F405 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F405ZG bool "STM32F405ZG" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F405 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407VE bool "STM32F407VE" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F407 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407VG bool "STM32F407VG" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F407 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407ZE bool "STM32F407ZE" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F407 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407ZG bool "STM32F407ZG" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F407 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407IE bool "STM32F407IE" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F407 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F407IG bool "STM32F407IG" select ARCH_CORTEXM4 select STM32_STM32F40XX + select STM32_STM32F407 select ARCH_HAVE_FPU config ARCH_CHIP_STM32F427V @@ -582,6 +591,7 @@ config STM32_PERFORMANCELINE config STM32_HIGHDENSITY bool default n + select STM32_HAVE_FSMC config STM32_MEDIUMDENSITY bool @@ -595,6 +605,7 @@ config STM32_STM32F20XX bool default n select STM32_HAVE_OTGFS + select STM32_HAVE_FSMC config STM32_STM32F30XX bool @@ -608,14 +619,29 @@ config STM32_STM32F40XX config STM32_STM32F401 bool + default n + +config STM32_STM32F405 + bool + default n + select STM32_HAVE_FSMC + +config STM32_STM32F407 + bool + default n + select STM32_HAVE_FSMC # This is really 427/437, but we treat the two the same. config STM32_STM32F427 bool + default n + select STM32_HAVE_FSMC # This is really 429/439, but we treat the two the same. config STM32_STM32F429 bool + default n + select STM32_HAVE_FSMC config STM32_DFU bool "DFU bootloader" @@ -635,6 +661,10 @@ config STM32_HAVE_OTGFS bool default n +config STM32_HAVE_FSMC + bool + default n + config STM32_ADC1 bool "ADC1" default n @@ -742,7 +772,7 @@ config STM32_ETHMAC config STM32_FSMC bool "FSMC" default n - depends on !STM32_CONNECTIVITYLINE && (STM32_HIGHDENSITY || STM32_STM32F20XX || STM32_STM32F40XX) + depends on STM32_HAVE_FSMC config STM32_HASH bool "HASH" diff --git a/nuttx/configs/nucleo-f401re/nsh/defconfig b/nuttx/configs/nucleo-f401re/nsh/defconfig index 4c7ea20dc..7e122b6ab 100644 --- a/nuttx/configs/nucleo-f401re/nsh/defconfig +++ b/nuttx/configs/nucleo-f401re/nsh/defconfig @@ -12,10 +12,6 @@ CONFIG_HOST_LINUX=y # CONFIG_HOST_OSX is not set # CONFIG_HOST_WINDOWS is not set # CONFIG_HOST_OTHER is not set -# CONFIG_WINDOWS_NATIVE is not set -# CONFIG_WINDOWS_CYGWIN is not set -# CONFIG_WINDOWS_MSYS is not set -# CONFIG_WINDOWS_OTHER is not set # # Build Configuration @@ -113,16 +109,10 @@ CONFIG_ARCH_HAVE_MPU=y # # ARMV7M Configuration Options # -# CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set # CONFIG_ARMV7M_TOOLCHAIN_CODEREDL is not set -# CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYL=y -# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set -# CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set -# CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set -# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set # CONFIG_SERIAL_TERMIOS is not set CONFIG_SDIO_DMA=y CONFIG_SDIO_DMAPRIO=0x00010000 @@ -222,6 +212,10 @@ CONFIG_ARCH_CHIP_STM32F401RE=y # CONFIG_STM32_STM32F30XX is not set CONFIG_STM32_STM32F40XX=y CONFIG_STM32_STM32F401=y +# CONFIG_STM32_STM32F405 is not set +# CONFIG_STM32_STM32F407 is not set +# CONFIG_STM32_STM32F427 is not set +# CONFIG_STM32_STM32F429 is not set # CONFIG_STM32_DFU is not set # @@ -229,6 +223,7 @@ CONFIG_STM32_STM32F401=y # # CONFIG_STM32_HAVE_USBDEV is not set CONFIG_STM32_HAVE_OTGFS=y +# CONFIG_STM32_HAVE_FSMC is not set # CONFIG_STM32_ADC1 is not set # CONFIG_STM32_ADC2 is not set # CONFIG_STM32_ADC3 is not set @@ -244,7 +239,6 @@ CONFIG_STM32_DMA2=y # CONFIG_STM32_DAC2 is not set # CONFIG_STM32_DCMI is not set # CONFIG_STM32_ETHMAC is not set -# CONFIG_STM32_FSMC is not set # CONFIG_STM32_HASH is not set # CONFIG_STM32_I2C1 is not set # CONFIG_STM32_I2C2 is not set @@ -336,6 +330,7 @@ CONFIG_ARCH_HAVE_IRQPRIO=y CONFIG_ARCH_HAVE_VFORK=y # CONFIG_ARCH_HAVE_MMU is not set # CONFIG_ARCH_NAND_HWECC is not set +# CONFIG_ARCH_HAVE_EXTCLK is not set CONFIG_ARCH_IRQPRIO=y # CONFIG_ARCH_STACKDUMP is not set # CONFIG_ENDIAN_BIG is not set |