From 0d14befb883dc72ec827d7e3b935d8c2e8d6db87 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 7 Jul 2014 08:03:18 -0600 Subject: [PATCH] SAM3/4: Fix compile of sam_aes.c if CONFIG_CRYPTO_AES is defined. rom Max Nekludov --- arch/arm/src/sam34/Make.defs | 4 ++++ drivers/bch/Kconfig | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/src/sam34/Make.defs b/arch/arm/src/sam34/Make.defs index 622f5ab8c8..3c62069a5b 100644 --- a/arch/arm/src/sam34/Make.defs +++ b/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/drivers/bch/Kconfig b/drivers/bch/Kconfig index 514683a09a..060b9d6e88 100644 --- a/drivers/bch/Kconfig +++ b/drivers/bch/Kconfig @@ -4,7 +4,7 @@ # config BCH_ENCRYPTION - bool "Enable encryption feature" + bool "Enable BCH encryption" default n depends on CRYPTO_AES