Merge pull request #3718 from bridadan/uvisor_define_fix

Fixing uvisor defines to fix build issues
2017-02-08 17:20:42 -06:00 · 2017-02-08 17:20:42 -06:00 · cd55625faf
parent 160455c972 bca993a602
commit cd55625faf
2 changed files with 2 additions and 1 deletions
--- a/cmsis/core_cmSecureAccess.h
+++ b/cmsis/core_cmSecureAccess.h
@ -42,7 +42,7 @@
 /* ###########################  Core Secure Access  ########################### */

 #ifdef FEATURE_UVISOR
-#include "uvisor-lib.h"
+#include "uvisor-lib/uvisor-lib.h"

 /* Secure uVisor implementation. */

--- a/features/FEATURE_UVISOR/includes/uvisor-lib/rtx/rtx_box_index.h
+++ b/features/FEATURE_UVISOR/includes/uvisor-lib/rtx/rtx_box_index.h
@ -18,6 +18,7 @@
 #define __RTX_BOX_INDEX_H__

 #include "cmsis_os.h"
+#include "api/inc/vmpu_exports.h"

 #ifdef __cplusplus
 extern "C" {