diff options
Diffstat (limited to 'include/lib')
| -rw-r--r-- | include/lib/aarch64/arch.h | 4 | ||||
| -rw-r--r-- | include/lib/utils_def.h | 2 | ||||
| -rw-r--r-- | include/lib/xlat_tables/xlat_tables_v2.h | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/lib/aarch64/arch.h b/include/lib/aarch64/arch.h index e38a5307..f85e7897 100644 --- a/include/lib/aarch64/arch.h +++ b/include/lib/aarch64/arch.h @@ -312,7 +312,7 @@ /* * TCR defintions */ -#define TCR_EL3_RES1 ((1UL << 31) | (1UL << 23)) +#define TCR_EL3_RES1 ((U(1) << 31) | (U(1) << 23)) #define TCR_EL1_IPS_SHIFT U(32) #define TCR_EL3_PS_SHIFT U(16) @@ -348,6 +348,8 @@ #define TCR_SH_OUTER_SHAREABLE (U(0x2) << 12) #define TCR_SH_INNER_SHAREABLE (U(0x3) << 12) +#define TCR_EPD1_BIT (U(1) << 23) + #define MODE_SP_SHIFT U(0x0) #define MODE_SP_MASK U(0x1) #define MODE_SP_EL0 U(0x0) diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h index 26ac4409..b397e302 100644 --- a/include/lib/utils_def.h +++ b/include/lib/utils_def.h @@ -16,7 +16,7 @@ #define SIZE_FROM_LOG2_WORDS(n) (4 << (n)) -#define BIT(nr) (1UL << (nr)) +#define BIT(nr) (1ULL << (nr)) #define MIN(x, y) __extension__ ({ \ __typeof__(x) _x = (x); \ diff --git a/include/lib/xlat_tables/xlat_tables_v2.h b/include/lib/xlat_tables/xlat_tables_v2.h index 2be43296..59f0955f 100644 --- a/include/lib/xlat_tables/xlat_tables_v2.h +++ b/include/lib/xlat_tables/xlat_tables_v2.h @@ -23,12 +23,12 @@ /* Helper macro to define entries for mmap_region_t. It allows to * re-map address mappings from 'pa' to 'va' for each region. */ -#define MAP_REGION(_pa, _va, _sz, _attr) ((mmap_region_t){ \ +#define MAP_REGION(_pa, _va, _sz, _attr) { \ .base_pa = (_pa), \ .base_va = (_va), \ .size = (_sz), \ .attr = (_attr), \ - }) + } /* * Shifts and masks to access fields of an mmap_attr_t |