diff options
| author | danh-arm <dan.handley@arm.com> | 2018-07-25 15:23:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-25 15:23:25 +0100 |
| commit | cad25f1484a6eadfd860daa4dd06c31685287bf9 (patch) | |
| tree | 990794c50b2e1b7227c319e7195f9b5db638ef01 | |
| parent | f94523ed9e2c91be18598aeeb53d7b5ba53370f9 (diff) | |
| parent | ecd62429af935b568b7c0ed6eeaec90b16a746f3 (diff) | |
| download | arm-trusted-firmware-cad25f1484a6eadfd860daa4dd06c31685287bf9.tar.gz | |
Merge pull request #1491 from jeenu-arm/misra-fix
Arm platforms: Fix type mismatch for arm_pm_idle_states
| -rw-r--r-- | include/plat/arm/common/plat_arm.h | 1 | ||||
| -rw-r--r-- | plat/arm/common/arm_pm.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/plat/arm/common/plat_arm.h b/include/plat/arm/common/plat_arm.h index 2f355661e..506bed348 100644 --- a/include/plat/arm/common/plat_arm.h +++ b/include/plat/arm/common/plat_arm.h @@ -283,5 +283,6 @@ void plat_arm_sp_min_early_platform_setup(u_register_t arg0, u_register_t arg1, /* global variables */ extern plat_psci_ops_t plat_arm_psci_pm_ops; extern const mmap_region_t plat_arm_mmap[]; +extern const unsigned int arm_pm_idle_states[]; #endif /* __PLAT_ARM_H__ */ diff --git a/plat/arm/common/arm_pm.c b/plat/arm/common/arm_pm.c index d0350d6c5..fb183207b 100644 --- a/plat/arm/common/arm_pm.c +++ b/plat/arm/common/arm_pm.c @@ -18,10 +18,6 @@ #pragma weak plat_arm_psci_override_pm_ops #pragma weak plat_arm_program_trusted_mailbox -#if ARM_RECOM_STATE_ID_ENC -extern unsigned int arm_pm_idle_states[]; -#endif /* __ARM_RECOM_STATE_ID_ENC__ */ - #if !ARM_RECOM_STATE_ID_ENC /******************************************************************************* * ARM standard platform handler called to check the validity of the power state |