summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-07-07 08:03:18 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-07-07 08:03:18 -0600
commit338a22c990b73c1292c9ad2f34e1b4128a4d79b6 (patch)
tree72369a9f60832f1d339e77870b9ff53fd5ee7273
parent54ad2ccf1760e9ffa49e563259e110ed464b3c94 (diff)
downloadnuttx-338a22c990b73c1292c9ad2f34e1b4128a4d79b6.tar.gz
nuttx-338a22c990b73c1292c9ad2f34e1b4128a4d79b6.tar.bz2
nuttx-338a22c990b73c1292c9ad2f34e1b4128a4d79b6.zip
SAM3/4: Fix compile of sam_aes.c if CONFIG_CRYPTO_AES is defined. rom Max Nekludov
-rw-r--r--nuttx/arch/arm/src/sam34/Make.defs4
-rw-r--r--nuttx/drivers/bch/Kconfig2
2 files changed, 5 insertions, 1 deletions
diff --git a/nuttx/arch/arm/src/sam34/Make.defs b/nuttx/arch/arm/src/sam34/Make.defs
index 622f5ab8c..3c62069a5 100644
--- a/nuttx/arch/arm/src/sam34/Make.defs
+++ b/nuttx/arch/arm/src/sam34/Make.defs
@@ -86,6 +86,10 @@ CHIP_CSRCS += sam_serial.c sam_start.c sam_timerisr.c
# Configuration-dependent SAM3/4 files
+ifeq ($(CONFIG_CRYPTO_AES),y)
+CHIP_CSRCS += sam_aes.c
+endif
+
ifeq ($(CONFIG_ARCH_CHIP_SAM4CM),y)
CHIP_CSRCS += sam4cm_supc.c
endif
diff --git a/nuttx/drivers/bch/Kconfig b/nuttx/drivers/bch/Kconfig
index 514683a09..060b9d6e8 100644
--- a/nuttx/drivers/bch/Kconfig
+++ b/nuttx/drivers/bch/Kconfig
@@ -4,7 +4,7 @@
#
config BCH_ENCRYPTION
- bool "Enable encryption feature"
+ bool "Enable BCH encryption"
default n
depends on CRYPTO_AES