diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-02-28 09:48:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-28 09:48:35 +0000 |
| commit | bd8e6a99e0ef3bb449b0ff0de13ea74c66079412 (patch) | |
| tree | 007736e41caea7aed022915ca9b69a32312972f6 /include | |
| parent | c69145fc2a8f1660131f555f286c6989c8343c74 (diff) | |
| parent | 5724481fdda01067d3bf4386a3dd07a541d16044 (diff) | |
Merge pull request #1287 from davidcunado-arm/dc/fix_misra
Update ULL() macro and instances of ull to comply with MISRA
Diffstat (limited to 'include')
| -rw-r--r-- | include/lib/utils_def.h | 4 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/lib/utils_def.h b/include/lib/utils_def.h index ecb261a1..4a5c3e0b 100644 --- a/include/lib/utils_def.h +++ b/include/lib/utils_def.h @@ -80,8 +80,8 @@ # define U(_x) (_x) # define ULL(_x) (_x) #else -# define U(_x) (_x##u) -# define ULL(_x) (_x##ull) +# define U(_x) (_x##U) +# define ULL(_x) (_x##ULL) #endif /* Register size of the current architecture. */ diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 9e6c7d27..95e986bf 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -279,11 +279,11 @@ * AArch64 builds */ #ifdef AARCH64 -#define PLAT_PHY_ADDR_SPACE_SIZE (1ull << 36) -#define PLAT_VIRT_ADDR_SPACE_SIZE (1ull << 36) +#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 36) +#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 36) #else -#define PLAT_PHY_ADDR_SPACE_SIZE (1ull << 32) -#define PLAT_VIRT_ADDR_SPACE_SIZE (1ull << 32) +#define PLAT_PHY_ADDR_SPACE_SIZE (1ULL << 32) +#define PLAT_VIRT_ADDR_SPACE_SIZE (1ULL << 32) #endif |