diff options
author | danh-arm <dan.handley@arm.com> | 2014-07-28 14:33:44 +0100 |
---|---|---|
committer | danh-arm <dan.handley@arm.com> | 2014-07-28 14:33:44 +0100 |
commit | dd2bdee61682df0ec65dfc43371c126a86a30c30 (patch) | |
tree | 12e1fca8b8e84230029bc9b6efa7f41b031ab069 /include | |
parent | 6397bf6a99d785caa9b50016cd6c8eb76083c117 (diff) | |
parent | d3280beb700321b0ef47b4f61d84667ba501bc61 (diff) |
Merge pull request #177 from jcastillo-arm/jc/tf-issues/096
Rework incorrect use of assert() and panic() in codebase
Diffstat (limited to 'include')
-rw-r--r-- | include/common/bl_common.h | 1 | ||||
-rw-r--r-- | include/drivers/arm/tzc400.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/common/bl_common.h b/include/common/bl_common.h index e996fd6a..9945e3a3 100644 --- a/include/common/bl_common.h +++ b/include/common/bl_common.h @@ -33,6 +33,7 @@ #define SECURE 0x0 #define NON_SECURE 0x1 +#define sec_state_is_valid(s) (((s) == SECURE) || ((s) == NON_SECURE)) #define UP 1 #define DOWN 0 diff --git a/include/drivers/arm/tzc400.h b/include/drivers/arm/tzc400.h index b4aa3ba5..03fce546 100644 --- a/include/drivers/arm/tzc400.h +++ b/include/drivers/arm/tzc400.h @@ -90,6 +90,7 @@ #define GATE_KEEPER_OS_MASK 0xf #define GATE_KEEPER_OR_SHIFT 0 #define GATE_KEEPER_OR_MASK 0xf +#define GATE_KEEPER_FILTER_MASK 0x1 /* Speculation is enabled by default. */ #define SPECULATION_CTRL_WRITE_DISABLE (1 << 1) |