commit d9d63e1ba9b2db291306c0dca7e87d138c0808fc
author Tamas Ban <tamas.ban@arm.com> Wed Oct 07 10:38:06 2020 +0100
committer Tamas Ban <tamas.ban@arm.com> Wed Oct 07 10:38:06 2020 +0100
tree 74a66dbf8891ff2e69654163547b3eb2ef057055
parent fc8d2f7f3e85ac7fb61a02a8a5c9083decdfe35d

Platform: Fix build issue on Musca-B1/S1

Build was broken on Musca-B1/S1 if the MCUBOOT_FIH_PROFILE
was not equal to HIGH.

Signed-off-by: Tamas Ban <tamas.ban@arm.com>
Change-Id: I96998d76e7867a814b1b2ccc1bb5bbd9d5710470

platform/ext/target/musca_b1/CMakeLists.txt

diff --git a/platform/ext/target/musca_b1/CMakeLists.txt b/platform/ext/target/musca_b1/CMakeLists.txt
index 5baa115..06b3bf9 100644
--- a/platform/ext/target/musca_b1/CMakeLists.txt
+++ b/platform/ext/target/musca_b1/CMakeLists.txt
@@ -160,5 +160,7 @@
             Device/Config
             Native_Driver
             Libraries
+            ${MCUBOOT_PATH}/boot/bootutil/include # for fault_injection_hardening.h only
+            ${CMAKE_CURRENT_BINARY_DIR}/../../../../bl2/ext/mcuboot # for mcuboot_config.h only
     )
 endif()

platform/ext/target/musca_b1/boot_hal.c

diff --git a/platform/ext/target/musca_b1/boot_hal.c b/platform/ext/target/musca_b1/boot_hal.c
index f49d7e7..4d1b1cb 100644
--- a/platform/ext/target/musca_b1/boot_hal.c
+++ b/platform/ext/target/musca_b1/boot_hal.c
@@ -12,6 +12,7 @@
 #include "boot_hal.h"
 #include "Driver_Flash.h"
 #include "flash_layout.h"
+#include "bootutil/fault_injection_hardening.h"
 
 #if defined(CRYPTO_HW_ACCELERATOR) || \
     defined(CRYPTO_HW_ACCELERATOR_OTP_PROVISIONING)

platform/ext/target/musca_s1/CMakeLists.txt

diff --git a/platform/ext/target/musca_s1/CMakeLists.txt b/platform/ext/target/musca_s1/CMakeLists.txt
index 0231d7c..1da5f6f 100644
--- a/platform/ext/target/musca_s1/CMakeLists.txt
+++ b/platform/ext/target/musca_s1/CMakeLists.txt
@@ -151,5 +151,7 @@
             CMSIS_Driver/Config
             Device/Config
             Native_Driver
+            ${MCUBOOT_PATH}/boot/bootutil/include # for fault_injection_hardening.h only
+            ${CMAKE_CURRENT_BINARY_DIR}/../../../../bl2/ext/mcuboot # for mcuboot_config.h only
     )
 endif()

platform/ext/target/musca_s1/boot_hal.c

diff --git a/platform/ext/target/musca_s1/boot_hal.c b/platform/ext/target/musca_s1/boot_hal.c
index cdc77a9..a8db47a 100644
--- a/platform/ext/target/musca_s1/boot_hal.c
+++ b/platform/ext/target/musca_s1/boot_hal.c
@@ -12,6 +12,7 @@
 #include "boot_hal.h"
 #include "Driver_Flash.h"
 #include "flash_layout.h"
+#include "bootutil/fault_injection_hardening.h"
 
 #if defined(CRYPTO_HW_ACCELERATOR) || \
     defined(CRYPTO_HW_ACCELERATOR_OTP_PROVISIONING)