From 011c6e0c7e7ff136aa874a1ecefc88aaa582810c Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 4 Feb 2015 07:24:19 -0600
Subject: [PATCH] Re-arrange condition logic from the last change to avoid
 having STM32-specific conditional logic outside of the STM32 sandbox.

---
 arch/arm/src/stm32/Kconfig   | 8 ++++++++
 arch/arm/src/stm32/Make.defs | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arch/arm/src/stm32/Kconfig b/arch/arm/src/stm32/Kconfig
index 5dd9f299dc..e48e953f36 100644
--- a/arch/arm/src/stm32/Kconfig
+++ b/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/arch/arm/src/stm32/Make.defs b/arch/arm/src/stm32/Make.defs
index 9f1a5b28ca..7f61348530 100644
--- a/arch/arm/src/stm32/Make.defs
+++ b/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