diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/export/lib/utils_def_exp.h | 4 | ||||
| -rw-r--r-- | include/lib/psci/psci.h | 2 | ||||
| -rw-r--r-- | include/plat/arm/common/arm_def.h | 2 | ||||
| -rw-r--r-- | include/plat/common/platform.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/include/export/lib/utils_def_exp.h b/include/export/lib/utils_def_exp.h index 86c409ce1..d4a4a85dd 100644 --- a/include/export/lib/utils_def_exp.h +++ b/include/export/lib/utils_def_exp.h @@ -25,11 +25,13 @@ # define L(_x) (_x) # define LL(_x) (_x) #else -# define U(_x) (_x##U) +# define U_(_x) (_x##U) +# define U(_x) U_(_x) # define UL(_x) (_x##UL) # define ULL(_x) (_x##ULL) # define L(_x) (_x##L) # define LL(_x) (_x##LL) + #endif #endif /* ARM_TRUSTED_FIRMWARE_EXPORT_LIB_UTILS_DEF_EXP_H */ diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index 7f7b7e3ff..b56e98b5f 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -20,7 +20,7 @@ #ifdef PLAT_NUM_PWR_DOMAINS #define PSCI_NUM_PWR_DOMAINS PLAT_NUM_PWR_DOMAINS #else -#define PSCI_NUM_PWR_DOMAINS (2 * PLATFORM_CORE_COUNT) +#define PSCI_NUM_PWR_DOMAINS (U(2) * PLATFORM_CORE_COUNT) #endif #define PSCI_NUM_NON_CPU_PWR_DOMAINS (PSCI_NUM_PWR_DOMAINS - \ diff --git a/include/plat/arm/common/arm_def.h b/include/plat/arm/common/arm_def.h index 72e2e8e96..b419c853e 100644 --- a/include/plat/arm/common/arm_def.h +++ b/include/plat/arm/common/arm_def.h @@ -21,7 +21,7 @@ /* Special value used to verify platform parameters from BL2 to BL31 */ #define ARM_BL31_PLAT_PARAM_VAL ULL(0x0f1e2d3c4b5a6978) -#define ARM_SYSTEM_COUNT 1 +#define ARM_SYSTEM_COUNT U(1) #define ARM_CACHE_WRITEBACK_SHIFT 6 diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h index 9efb2fd52..332cfca8d 100644 --- a/include/plat/common/platform.h +++ b/include/plat/common/platform.h @@ -237,7 +237,7 @@ void plat_psci_stat_accounting_start(const psci_power_state_t *state_info); void plat_psci_stat_accounting_stop(const psci_power_state_t *state_info); u_register_t plat_psci_stat_get_residency(unsigned int lvl, const psci_power_state_t *state_info, - int last_cpu_idx); + unsigned int last_cpu_idx); plat_local_state_t plat_get_target_pwr_state(unsigned int lvl, const plat_local_state_t *states, unsigned int ncpu); |