diff options
| author | Sandrine Bailleux <sandrine.bailleux@arm.com> | 2023-05-04 11:07:42 +0200 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-05-04 11:07:42 +0200 |
| commit | 03971a07b98bb484adf7faf50ff72038162a24c6 (patch) | |
| tree | a5b3a4bfe400d279c76ae52a32f69235c60d466a | |
| parent | 17f9732da56df0b991351723b187ce3d57017091 (diff) | |
| parent | 9b266556d308c0af6f932fedd1c41fbda05204aa (diff) | |
| download | arm-trusted-firmware-03971a07b98bb484adf7faf50ff72038162a24c6.tar.gz | |
Merge "fix(tc): only suspend booting after running plat tests" into integration
| -rw-r--r-- | plat/arm/board/tc/tc_bl31_setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/plat/arm/board/tc/tc_bl31_setup.c b/plat/arm/board/tc/tc_bl31_setup.c index aa88f7f3d..8ad1d3056 100644 --- a/plat/arm/board/tc/tc_bl31_setup.c +++ b/plat/arm/board/tc/tc_bl31_setup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2023, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2020-2023, Arm Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -53,6 +53,7 @@ void tc_bl31_common_platform_setup(void) { arm_bl31_platform_setup(); +#if defined(PLATFORM_TEST_NV_COUNTERS) || defined(PLATFORM_TEST_TFM_TESTSUITE) #ifdef PLATFORM_TEST_NV_COUNTERS nv_counter_test(); #elif PLATFORM_TEST_TFM_TESTSUITE @@ -60,6 +61,7 @@ void tc_bl31_common_platform_setup(void) #endif /* Suspend booting */ plat_error_handler(-1); +#endif } const plat_psci_ops_t *plat_arm_psci_override_pm_ops(plat_psci_ops_t *ops) |