Merge pull request #1477 from dp-arm/dp/css-ap-core
authorDimitris Papastamos <[email protected]>
Fri, 13 Jul 2018 14:23:29 +0000 (15:23 +0100)
committerGitHub <[email protected]>
Fri, 13 Jul 2018 14:23:29 +0000 (15:23 +0100)
CSS: Add support for SCMI AP core config protocol

1  2 
include/plat/arm/common/plat_arm.h
plat/arm/common/arm_bl1_setup.c
plat/arm/common/arm_pm.c

Simple merge
Simple merge
index 4fdb10a5090d01e913ecd15f4c2fb7068501a243,73d7106bdd0d8763fa47a462736adfc3b9fe7afc..d0350d6c5d5cb5b5c2bf80c8cbad9836a10b0307
  #include <platform_def.h>
  #include <psci.h>
  
- /* Allow ARM Standard platforms to override this function */
+ /* Allow ARM Standard platforms to override these functions */
  #pragma weak plat_arm_psci_override_pm_ops
+ #pragma weak plat_arm_program_trusted_mailbox
  
 -/* Standard ARM platforms are expected to export plat_arm_psci_pm_ops */
 -extern plat_psci_ops_t plat_arm_psci_pm_ops;
 -
  #if ARM_RECOM_STATE_ID_ENC
  extern unsigned int arm_pm_idle_states[];
  #endif /* __ARM_RECOM_STATE_ID_ENC__ */