commit 2fe049262a441dd11e878e4a5f4a3d67aabfefe3
author Balint Matyi <Balint.Matyi@arm.com> Tue Feb 18 12:27:38 2020 +0000
committer Tamas Ban <tamas.ban@arm.com> Mon Apr 20 09:39:32 2020 +0000
tree 508310473c6da89838437c7b7d0ca451a099adec
parent c071161c062fcbc05b767ed5b5a0f2aacbf748ec

Build: Move MCUBoot configs from compile time defines to header

Changed the propagation of configurations from being passed by
CMake, to putting them into a dynamically generated header file.

Change-Id: I419121af3762929f18d3b408594d3f5f61528ddb
Signed-off-by: Balint Matyi <Balint.Matyi@arm.com>

bl2/ext/mcuboot/bootutil/include/bootutil/sign_key.h

diff --git a/bl2/ext/mcuboot/bootutil/include/bootutil/sign_key.h b/bl2/ext/mcuboot/bootutil/include/bootutil/sign_key.h
index b0c1f21..7b87df8 100644
--- a/bl2/ext/mcuboot/bootutil/include/bootutil/sign_key.h
+++ b/bl2/ext/mcuboot/bootutil/include/bootutil/sign_key.h
@@ -21,6 +21,7 @@
 #define __BOOTUTIL_SIGN_KEY_H_
 
 #include <stdint.h>
+#include "mcuboot_config/mcuboot_config.h"
 
 #ifdef __cplusplus
 extern "C" {

bl2/ext/mcuboot/bootutil/src/bootutil_priv.h

diff --git a/bl2/ext/mcuboot/bootutil/src/bootutil_priv.h b/bl2/ext/mcuboot/bootutil/src/bootutil_priv.h
index 4edfcdb..a55b50d 100644
--- a/bl2/ext/mcuboot/bootutil/src/bootutil_priv.h
+++ b/bl2/ext/mcuboot/bootutil/src/bootutil_priv.h
@@ -32,6 +32,7 @@
 #include "bootutil/bootutil.h"
 #include "bootutil/image.h"
 #include "flash_layout.h"
+#include "mcuboot_config/mcuboot_config.h"
 
 #ifdef __cplusplus
 extern "C" {

bl2/ext/mcuboot/bootutil/src/image_rsa.c

diff --git a/bl2/ext/mcuboot/bootutil/src/image_rsa.c b/bl2/ext/mcuboot/bootutil/src/image_rsa.c
index ea7c78f..c29ea00 100644
--- a/bl2/ext/mcuboot/bootutil/src/image_rsa.c
+++ b/bl2/ext/mcuboot/bootutil/src/image_rsa.c
@@ -21,11 +21,13 @@
  * Original code taken from mcuboot project at:
  * https://github.com/JuulLabs-OSS/mcuboot
  * Git SHA of the original version: ac55554059147fff718015be9f4bd3108123f50a
- * Modifications are Copyright (c) 2018-2019 Arm Limited.
+ * Modifications are Copyright (c) 2018-2020 Arm Limited.
  */
 
 #include <string.h>
 
+#include "mcuboot_config/mcuboot_config.h"
+
 #ifdef MCUBOOT_SIGN_RSA
 #include "bootutil/sign_key.h"
 #include "bootutil/sha256.h"

bl2/ext/mcuboot/bootutil/src/image_validate.c

diff --git a/bl2/ext/mcuboot/bootutil/src/image_validate.c b/bl2/ext/mcuboot/bootutil/src/image_validate.c
index db9d541..938996b 100644
--- a/bl2/ext/mcuboot/bootutil/src/image_validate.c
+++ b/bl2/ext/mcuboot/bootutil/src/image_validate.c
@@ -35,6 +35,8 @@
 #include "bootutil/sign_key.h"
 #include "security_cnt.h"
 
+#include "mcuboot_config/mcuboot_config.h"
+
 #if defined(MCUBOOT_SIGN_RSA)
 #include "mbedtls/rsa.h"
 #endif

bl2/ext/mcuboot/bootutil/src/loader.c

diff --git a/bl2/ext/mcuboot/bootutil/src/loader.c b/bl2/ext/mcuboot/bootutil/src/loader.c
index 2197a47..2b6f655 100644
--- a/bl2/ext/mcuboot/bootutil/src/loader.c
+++ b/bl2/ext/mcuboot/bootutil/src/loader.c
@@ -45,6 +45,7 @@
 #include "bl2/include/tfm_boot_status.h"
 #include "bl2/include/boot_record.h"
 #include "security_cnt.h"
+#include "mcuboot_config/mcuboot_config.h"
 
 static struct boot_loader_state boot_data;