From 0b812305998380569fc609ea87157975780fc1e2 Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Mon, 24 Sep 2018 17:18:33 +0100 Subject: [PATCH] PSCI: Remove deprecated file plat_psci_common.c Change-Id: I9fd8016527ad7706494f34356fdae8efacef5f72 Signed-off-by: Antonio Nino Diaz --- include/lib/psci/psci.h | 6 ------ lib/psci/aarch64/psci_helpers.S | 3 --- plat/common/aarch64/plat_psci_common.c | 9 --------- 3 files changed, 18 deletions(-) delete mode 100644 plat/common/aarch64/plat_psci_common.c diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index d08b38c5..b27e4815 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -347,12 +347,6 @@ int psci_features(unsigned int psci_fid); void __dead2 psci_power_down_wfi(void); void psci_arch_setup(void); -/* - * The below API is deprecated. This is now replaced by bl31_warmboot_entry in - * AArch64. - */ -void psci_entrypoint(void) __deprecated; - #endif /*__ASSEMBLY__*/ #endif /* PSCI_H */ diff --git a/lib/psci/aarch64/psci_helpers.S b/lib/psci/aarch64/psci_helpers.S index 06d6636e..78141b1a 100644 --- a/lib/psci/aarch64/psci_helpers.S +++ b/lib/psci/aarch64/psci_helpers.S @@ -12,9 +12,6 @@ .globl psci_do_pwrdown_cache_maintenance .globl psci_do_pwrup_cache_maintenance .globl psci_power_down_wfi -#if !ERROR_DEPRECATED - .globl psci_entrypoint -#endif /* ----------------------------------------------------------------------- * void psci_do_pwrdown_cache_maintenance(unsigned int power level); diff --git a/plat/common/aarch64/plat_psci_common.c b/plat/common/aarch64/plat_psci_common.c deleted file mode 100644 index 35afcdb9..00000000 --- a/plat/common/aarch64/plat_psci_common.c +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#if !ERROR_DEPRECATED -#include "../plat_psci_common.c" -#endif -- 2.30.2