commit 84ed794d142cd3cbf7838d4e28e4bbfad5a277fd
author Fabio Utzig <utzig@apache.org> Wed Feb 14 19:59:44 2018 -0200
committer David Brown <davidb@davidb.org> Fri Feb 16 16:31:38 2018 -0700
tree 575223a837d40c55bc6967c82d501e38ec65dff4
parent b519ed03dc57c5665783681a9d2f34f916427479

Fix configuration when RSA signature is used

This defines the correct "mbedtls" config files in both ECDSA256 and RSA
modes.

Signed-off-by: Fabio Utzig <utzig@apache.org>

boot/zephyr/os.c

diff --git a/boot/zephyr/os.c b/boot/zephyr/os.c
index 7c24eb3..1f9b178 100644
--- a/boot/zephyr/os.c
+++ b/boot/zephyr/os.c
@@ -22,9 +22,9 @@
 
 #include "os/os_heap.h"
 
-#if !defined(CONFIG_MBEDTLS) && defined(MCUBOOT_USE_MBED_TLS)
+#ifdef MCUBOOT_USE_MBED_TLS
+#define MBEDTLS_CONFIG_FILE CONFIG_MBEDTLS_CFG_FILE
 
-#define MBEDTLS_CONFIG_FILE MCUBOOT_MBEDTLS_CFG_FILE
 #include <mbedtls/platform.h>
 #include <mbedtls/memory_buffer_alloc.h>
 
@@ -45,6 +45,7 @@
     mbedtls_memory_buffer_alloc_init(mempool, sizeof(mempool));
 }
 #else
+#define MBEDTLS_CONFIG_FILE MCUBOOT_MBEDTLS_CFG_FILE
 void os_heap_init(void)
 {
 }