diff options
| author | Lauren Wehrmeister <lauren.wehrmeister@arm.com> | 2021-02-03 16:09:51 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2021-02-03 16:09:51 +0000 |
| commit | d5105d994c683194dc0310c81624a6837ebda14a (patch) | |
| tree | f50831bcce0933c26feee9c2fba456610857c3ae | |
| parent | 6d0dcc7d96eac9532237194acbe6a1468128e072 (diff) | |
| parent | f7bab2761693f25013a367f03782c8478a5e9db8 (diff) | |
| download | platform_external_arm-trusted-firmware-d5105d994c683194dc0310c81624a6837ebda14a.tar.gz platform_external_arm-trusted-firmware-d5105d994c683194dc0310c81624a6837ebda14a.tar.bz2 platform_external_arm-trusted-firmware-d5105d994c683194dc0310c81624a6837ebda14a.zip | |
Merge changes from topic "RD_INFRA_POWER_MODING" into integration
* changes:
plat/arm/board: enable AMU for RD-N2
plat/arm/board: enable AMU for RD-V1
plat/arm/sgi: allow all PSCI callbacks on RD-V1
| -rw-r--r-- | plat/arm/board/rdn2/platform.mk | 3 | ||||
| -rw-r--r-- | plat/arm/board/rdv1/platform.mk | 3 | ||||
| -rw-r--r-- | plat/arm/css/sgi/sgi_bl31_setup.c | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/plat/arm/board/rdn2/platform.mk b/plat/arm/board/rdn2/platform.mk index 6be611360..03771dc3d 100644 --- a/plat/arm/board/rdn2/platform.mk +++ b/plat/arm/board/rdn2/platform.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2020, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2020-2021, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -57,3 +57,4 @@ NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb $(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config)) override CTX_INCLUDE_AARCH32_REGS := 0 +override ENABLE_AMU := 1 diff --git a/plat/arm/board/rdv1/platform.mk b/plat/arm/board/rdv1/platform.mk index 5033b1874..2ffd139c9 100644 --- a/plat/arm/board/rdv1/platform.mk +++ b/plat/arm/board/rdv1/platform.mk @@ -1,4 +1,4 @@ -# Copyright (c) 2020, ARM Limited and Contributors. All rights reserved. +# Copyright (c) 2020-2021, ARM Limited and Contributors. All rights reserved. # # SPDX-License-Identifier: BSD-3-Clause # @@ -57,3 +57,4 @@ NT_FW_CONFIG := ${BUILD_PLAT}/fdts/${PLAT}_nt_fw_config.dtb $(eval $(call TOOL_ADD_PAYLOAD,${NT_FW_CONFIG},--nt-fw-config,${NT_FW_CONFIG})) override CTX_INCLUDE_AARCH32_REGS := 0 +override ENABLE_AMU := 1 diff --git a/plat/arm/css/sgi/sgi_bl31_setup.c b/plat/arm/css/sgi/sgi_bl31_setup.c index 89e2cab08..36c3fbb6c 100644 --- a/plat/arm/css/sgi/sgi_bl31_setup.c +++ b/plat/arm/css/sgi/sgi_bl31_setup.c @@ -108,12 +108,11 @@ void sgi_bl31_common_platform_setup(void) const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops) { /* - * For RD-E1-Edge and RD-V1 platforms, only CPU power ON/OFF - * PSCI platform callbacks are supported. + * For RD-E1-Edge, only CPU power ON/OFF, PSCI platform callbacks are + * supported. */ if (((sgi_plat_info.platform_id == RD_N1E1_EDGE_SID_VER_PART_NUM) && - (sgi_plat_info.config_id == RD_E1_EDGE_CONFIG_ID)) || - (sgi_plat_info.platform_id == RD_V1_SID_VER_PART_NUM)) { + (sgi_plat_info.config_id == RD_E1_EDGE_CONFIG_ID))) { ops->cpu_standby = NULL; ops->system_off = NULL; ops->system_reset = NULL; |