From 3af72d57fd00b1e3f6e3cf132dc4fc17ccd82615 Mon Sep 17 00:00:00 2001 From: Joel Hutton Date: Tue, 8 Jan 2019 15:18:28 +0000 Subject: [PATCH] juno:Fix CSS_USE_SCMI_SDS_DRIVER=0 configuration A previous commit 89f2e589856f ("plat/arm: remove weak implemention of 'plat_arm_psci_override_pm_ops' function") introduced a problem with the CSS_USE_SCMI_SDS_DRIVER configuration. In juno_pm.c the css_scmi_override_pm_ops function was used regardless of whether the flag was set. This patch ifdefs the function to restore the original behaviour. Change-Id: I508025ba70cf3a9250cc6270c1df209179c37ae7 Signed-off-by: Joel Hutton --- plat/arm/board/juno/juno_pm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plat/arm/board/juno/juno_pm.c b/plat/arm/board/juno/juno_pm.c index da2e92bae..dbf7b6c69 100644 --- a/plat/arm/board/juno/juno_pm.c +++ b/plat/arm/board/juno/juno_pm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -9,5 +9,9 @@ const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops) { +#if CSS_USE_SCMI_SDS_DRIVER return css_scmi_override_pm_ops(ops); +#else + return ops; +#endif /* CSS_USE_SCMI_SDS_DRIVER */ } -- GitLab