summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2015-02-04 07:24:19 -0600
committerGregory Nutt <gnutt@nuttx.org>2015-02-04 07:24:19 -0600
commit0549cdfccdac2ce258bc51a3a86877ffcf4b87d8 (patch)
treed0c1f93e460d57c71588394afb71bdbea8bb0645 /nuttx/arch
parentca83154fa5a06295072fdbbcfb616b32314b86a3 (diff)
downloadpx4-nuttx-0549cdfccdac2ce258bc51a3a86877ffcf4b87d8.tar.gz
px4-nuttx-0549cdfccdac2ce258bc51a3a86877ffcf4b87d8.tar.bz2
px4-nuttx-0549cdfccdac2ce258bc51a3a86877ffcf4b87d8.zip
Re-arrange condition logic from the last change to avoid having STM32-specific conditional logic outside of the STM32 sandbox.
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/arm/src/stm32/Kconfig8
-rw-r--r--nuttx/arch/arm/src/stm32/Make.defs2
2 files changed, 9 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/stm32/Kconfig b/nuttx/arch/arm/src/stm32/Kconfig
index 5dd9f299d..e48e953f3 100644
--- a/nuttx/arch/arm/src/stm32/Kconfig
+++ b/nuttx/arch/arm/src/stm32/Kconfig
@@ -169,6 +169,7 @@ config ARCH_CHIP_STM32L162ZD
select STM32_STM32L15XX
select STM32_ENERGYLITE
select STM32_HIGHDENSITY
+ select STM32_HAVE_AES
---help---
STM32L 144-pin EnergyLite, 384KB FLASH, 48KB SRAM, 12KB EEPRROM with
8x40 LCD interface
@@ -1149,6 +1150,13 @@ config STM32_CCMDATARAM
default n
depends on STM32_STM32F40XX
+config STM32_AES
+ bool "128-bit AES"
+ default n
+ depends on STM32_HAVE_AES
+ select CRYPTO_AES192_DISABLE
+ select CRYPTO_AES256_DISABLE
+
config STM32_CEC
bool "CEC"
default n
diff --git a/nuttx/arch/arm/src/stm32/Make.defs b/nuttx/arch/arm/src/stm32/Make.defs
index 9f1a5b28c..7f6134853 100644
--- a/nuttx/arch/arm/src/stm32/Make.defs
+++ b/nuttx/arch/arm/src/stm32/Make.defs
@@ -227,6 +227,6 @@ ifeq ($(CONFIG_DEBUG),y)
CHIP_CSRCS += stm32_dumpgpio.c
endif
-ifeq ($(CONFIG_CRYPTO_AES),y)
+ifeq ($(CONFIG_STM32_AES),y)
CHIP_CSRCS += stm32_aes.c
endif