diff options
35 files changed, 0 insertions, 72 deletions
diff --git a/core/arch/arm/include/kernel/pm_stubs.h b/core/arch/arm/include/kernel/pm_stubs.h deleted file mode 100644 index 02d987da..00000000 --- a/core/arch/arm/include/kernel/pm_stubs.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ -/* - * Copyright (c) 2015, Linaro Limited - */ - -#ifndef PM_STUBS_H -#define PM_STUBS_H - -#include <stdint.h> -#include <compiler.h> - -unsigned long pm_panic(unsigned long a0, unsigned long a1); -unsigned long pm_do_nothing(unsigned long a0, unsigned long a1); - -#endif /* PM_STUBS_H */ diff --git a/core/arch/arm/kernel/boot.c b/core/arch/arm/kernel/boot.c index 62dc61d1..dd393aac 100644 --- a/core/arch/arm/kernel/boot.c +++ b/core/arch/arm/kernel/boot.c @@ -17,7 +17,6 @@ #include <kernel/linker.h> #include <kernel/misc.h> #include <kernel/panic.h> -#include <kernel/pm_stubs.h> #include <kernel/tee_misc.h> #include <kernel/thread.h> #include <kernel/tpm.h> diff --git a/core/arch/arm/kernel/pm_stubs.c b/core/arch/arm/kernel/pm_stubs.c deleted file mode 100644 index e559df80..00000000 --- a/core/arch/arm/kernel/pm_stubs.c +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-License-Identifier: BSD-2-Clause -/* - * Copyright (c) 2015-2020, Linaro Limited - */ - -#include <compiler.h> -#include <keep.h> -#include <kernel/panic.h> -#include <kernel/pm_stubs.h> - -unsigned long __noreturn pm_panic(unsigned long a0 __unused, - unsigned long a1 __unused) -{ - panic(); -} -DECLARE_KEEP_PAGER(pm_panic); - -unsigned long pm_do_nothing(unsigned long a0 __unused, - unsigned long a1 __unused) -{ - return 0; -} -DECLARE_KEEP_PAGER(pm_do_nothing); diff --git a/core/arch/arm/kernel/sub.mk b/core/arch/arm/kernel/sub.mk index 965b13e4..4190a0c5 100644 --- a/core/arch/arm/kernel/sub.mk +++ b/core/arch/arm/kernel/sub.mk @@ -48,7 +48,6 @@ srcs-$(CFG_ARM64_core) += misc_a64.S srcs-y += mutex.c srcs-$(CFG_LOCKDEP) += mutex_lockdep.c srcs-y += wait_queue.c -srcs-$(CFG_PM_STUBS) += pm_stubs.c srcs-y += boot.c srcs-$(CFG_ARM32_core) += entry_a32.S diff --git a/core/arch/arm/plat-amlogic/conf.mk b/core/arch/arm/plat-amlogic/conf.mk index 3395de6d..4b7f8cb5 100644 --- a/core/arch/arm/plat-amlogic/conf.mk +++ b/core/arch/arm/plat-amlogic/conf.mk @@ -9,7 +9,6 @@ CFG_TZDRAM_SIZE ?= 0x00c00000 CFG_SHMEM_START ?= 0x05000000 CFG_SHMEM_SIZE ?= 0x00100000 -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) $(call force,CFG_AMLOGIC_UART,y) diff --git a/core/arch/arm/plat-bcm/conf.mk b/core/arch/arm/plat-bcm/conf.mk index 00741ada..afcd0c0f 100644 --- a/core/arch/arm/plat-bcm/conf.mk +++ b/core/arch/arm/plat-bcm/conf.mk @@ -17,7 +17,6 @@ CFG_SHMEM_SIZE ?= 0x01000000 # 16MB CFG_TEE_RAM_VA_SIZE := 0x400000 # 4MB $(call force,CFG_WITH_ARM_TRUSTED_FW,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) ifeq ($(PLATFORM_FLAVOR),ns3) diff --git a/core/arch/arm/plat-d02/conf.mk b/core/arch/arm/plat-d02/conf.mk index 8a6af171..22f130a9 100644 --- a/core/arch/arm/plat-d02/conf.mk +++ b/core/arch/arm/plat-d02/conf.mk @@ -8,7 +8,6 @@ CFG_WITH_SOFTWARE_PRNG ?= n CFG_CORE_HEAP_SIZE ?= 98304 $(call force,CFG_HI16XX_UART,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) ifneq ($(CFG_WITH_SOFTWARE_PRNG),y) diff --git a/core/arch/arm/plat-hikey/conf.mk b/core/arch/arm/plat-hikey/conf.mk index 2ad05259..c11dca2d 100644 --- a/core/arch/arm/plat-hikey/conf.mk +++ b/core/arch/arm/plat-hikey/conf.mk @@ -4,7 +4,6 @@ include core/arch/arm/cpu/cortex-armv8-0.mk $(call force,CFG_TEE_CORE_NB_CORE,8) $(call force,CFG_PL011,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) diff --git a/core/arch/arm/plat-hisilicon/conf.mk b/core/arch/arm/plat-hisilicon/conf.mk index 208dae01..dc118d87 100644 --- a/core/arch/arm/plat-hisilicon/conf.mk +++ b/core/arch/arm/plat-hisilicon/conf.mk @@ -10,7 +10,6 @@ $(call force,CFG_TEE_CORE_NB_CORE,2) $(call force,CFG_CORE_CLUSTER_SHIFT,0) $(call force,CFG_PL011,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_ARM32_core,y) $(call force,CFG_PSCI_ARM32,y) diff --git a/core/arch/arm/plat-hisilicon/psci.c b/core/arch/arm/plat-hisilicon/psci.c index 24b03842..be00a107 100644 --- a/core/arch/arm/plat-hisilicon/psci.c +++ b/core/arch/arm/plat-hisilicon/psci.c @@ -8,7 +8,6 @@ #include <kernel/boot.h> #include <kernel/misc.h> #include <kernel/panic.h> -#include <kernel/pm_stubs.h> #include <mm/core_mmu.h> #include <mm/core_memprot.h> #include <platform_config.h> diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk index de567e94..4c0cdca0 100644 --- a/core/arch/arm/plat-imx/conf.mk +++ b/core/arch/arm/plat-imx/conf.mk @@ -353,7 +353,6 @@ endif ifneq (,$(filter y, $(CFG_MX6) $(CFG_MX7) $(CFG_MX7ULP))) $(call force,CFG_GIC,y) -$(call force,CFG_PM_STUBS,y) CFG_BOOT_SECONDARY_REQUEST ?= y CFG_DT ?= y @@ -386,7 +385,6 @@ $(call force,CFG_WITH_ARM_TRUSTED_FW,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) CFG_CRYPTO_WITH_CE ?= y -CFG_PM_STUBS ?= y supported-ta-targets = ta_arm64 endif diff --git a/core/arch/arm/plat-imx/pm/cpuidle-imx7d.c b/core/arch/arm/plat-imx/pm/cpuidle-imx7d.c index c7777a38..5f6c2bda 100644 --- a/core/arch/arm/plat-imx/pm/cpuidle-imx7d.c +++ b/core/arch/arm/plat-imx/pm/cpuidle-imx7d.c @@ -18,7 +18,6 @@ #include <kernel/interrupt.h> #include <kernel/misc.h> #include <kernel/panic.h> -#include <kernel/pm_stubs.h> #include <kernel/spinlock.h> #include <mm/core_mmu.h> #include <mm/core_memprot.h> diff --git a/core/arch/arm/plat-imx/pm/pm-imx7.c b/core/arch/arm/plat-imx/pm/pm-imx7.c index aaba7daf..a53a2c11 100644 --- a/core/arch/arm/plat-imx/pm/pm-imx7.c +++ b/core/arch/arm/plat-imx/pm/pm-imx7.c @@ -10,7 +10,6 @@ #include <imx.h> #include <imx_pm.h> #include <kernel/panic.h> -#include <kernel/pm_stubs.h> #include <kernel/cache_helpers.h> #include <mm/core_mmu.h> #include <mm/core_memprot.h> diff --git a/core/arch/arm/plat-imx/pm/psci.c b/core/arch/arm/plat-imx/pm/psci.c index c22eba92..32d40f9b 100644 --- a/core/arch/arm/plat-imx/pm/psci.c +++ b/core/arch/arm/plat-imx/pm/psci.c @@ -15,7 +15,6 @@ #include <kernel/boot.h> #include <kernel/misc.h> #include <kernel/panic.h> -#include <kernel/pm_stubs.h> #include <mm/core_mmu.h> #include <mm/core_memprot.h> #include <platform_config.h> diff --git a/core/arch/arm/plat-k3/conf.mk b/core/arch/arm/plat-k3/conf.mk index 778fe9f2..99c57fbc 100644 --- a/core/arch/arm/plat-k3/conf.mk +++ b/core/arch/arm/plat-k3/conf.mk @@ -12,7 +12,6 @@ CFG_SHMEM_SIZE ?= 0x00400000 # 4MB $(call force,CFG_TEE_CORE_NB_CORE,8) $(call force,CFG_8250_UART,y) $(call force,CFG_HWSUPP_MEM_PERM_PXN,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) $(call force,CFG_GIC,y) diff --git a/core/arch/arm/plat-ls/conf.mk b/core/arch/arm/plat-ls/conf.mk index 49c57600..26962713 100644 --- a/core/arch/arm/plat-ls/conf.mk +++ b/core/arch/arm/plat-ls/conf.mk @@ -3,7 +3,6 @@ PLATFORM_FLAVOR ?= ls1021atwr $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_GIC,y) $(call force,CFG_16550_UART,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_LS,y) $(call force,CFG_DRAM0_BASE,0x80000000) diff --git a/core/arch/arm/plat-marvell/conf.mk b/core/arch/arm/plat-marvell/conf.mk index a7683969..efc7bf7f 100644 --- a/core/arch/arm/plat-marvell/conf.mk +++ b/core/arch/arm/plat-marvell/conf.mk @@ -38,7 +38,6 @@ endif $(call force,CFG_WITH_ARM_TRUSTED_FW,y) $(call force,CFG_ARM64_core,y) $(call force,CFG_GIC,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_CORE_CLUSTER_SHIFT,1) diff --git a/core/arch/arm/plat-mediatek/conf.mk b/core/arch/arm/plat-mediatek/conf.mk index 3ffa68f9..985229e9 100644 --- a/core/arch/arm/plat-mediatek/conf.mk +++ b/core/arch/arm/plat-mediatek/conf.mk @@ -9,7 +9,6 @@ CFG_SHMEM_START ?= 0xbfe00000 CFG_SHMEM_SIZE ?= 0x00200000 $(call force,CFG_8250_UART,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) diff --git a/core/arch/arm/plat-poplar/conf.mk b/core/arch/arm/plat-poplar/conf.mk index a9016ae7..3180311c 100644 --- a/core/arch/arm/plat-poplar/conf.mk +++ b/core/arch/arm/plat-poplar/conf.mk @@ -3,7 +3,6 @@ include core/arch/arm/cpu/cortex-armv8-0.mk $(call force,CFG_TEE_CORE_NB_CORE,4) $(call force,CFG_PL011,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) diff --git a/core/arch/arm/plat-rcar/conf.mk b/core/arch/arm/plat-rcar/conf.mk index 735bcd8c..7aab4910 100644 --- a/core/arch/arm/plat-rcar/conf.mk +++ b/core/arch/arm/plat-rcar/conf.mk @@ -2,7 +2,6 @@ PLATFORM_FLAVOR ?= salvator_h3 include core/arch/arm/cpu/cortex-armv8-0.mk -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) $(call force,CFG_SCIF,y) diff --git a/core/arch/arm/plat-rockchip/conf.mk b/core/arch/arm/plat-rockchip/conf.mk index a3082338..f6eef865 100644 --- a/core/arch/arm/plat-rockchip/conf.mk +++ b/core/arch/arm/plat-rockchip/conf.mk @@ -1,7 +1,6 @@ PLATFORM_FLAVOR ?= rk322x $(call force,CFG_GIC,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_8250_UART,y) diff --git a/core/arch/arm/plat-rpi3/conf.mk b/core/arch/arm/plat-rpi3/conf.mk index d2b286fe..28b2c153 100644 --- a/core/arch/arm/plat-rpi3/conf.mk +++ b/core/arch/arm/plat-rpi3/conf.mk @@ -9,7 +9,6 @@ CFG_TZDRAM_SIZE ?= 0x00F00000 CFG_TEE_RAM_VA_SIZE ?= 0x00700000 $(call force,CFG_8250_UART,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) diff --git a/core/arch/arm/plat-sam/conf.mk b/core/arch/arm/plat-sam/conf.mk index 4f536e6f..3b3067eb 100644 --- a/core/arch/arm/plat-sam/conf.mk +++ b/core/arch/arm/plat-sam/conf.mk @@ -4,7 +4,6 @@ include core/arch/arm/cpu/cortex-a5.mk $(call force,CFG_TEE_CORE_NB_CORE,1) $(call force,CFG_ATMEL_UART,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_REE,y) $(call force,CFG_NO_SMP,y) $(call force,CFG_PL310,y) diff --git a/core/arch/arm/plat-sprd/conf.mk b/core/arch/arm/plat-sprd/conf.mk index fde60a99..8d3c78ee 100644 --- a/core/arch/arm/plat-sprd/conf.mk +++ b/core/arch/arm/plat-sprd/conf.mk @@ -13,7 +13,6 @@ endif $(call force,CFG_GIC,y) $(call force,CFG_SPRD_UART,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) # Overrides default in mk/config.mk with 128 kB diff --git a/core/arch/arm/plat-stm/conf.mk b/core/arch/arm/plat-stm/conf.mk index c47e3c96..4e78f360 100644 --- a/core/arch/arm/plat-stm/conf.mk +++ b/core/arch/arm/plat-stm/conf.mk @@ -6,7 +6,6 @@ $(call force,CFG_ARM32_core,y) $(call force,CFG_SECURE_TIME_SOURCE_REE,y) $(call force,CFG_PL310,y) $(call force,CFG_CACHE_API,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_WITH_LPAE,n) $(call force,CFG_GIC,y) diff --git a/core/arch/arm/plat-stm32mp1/conf.mk b/core/arch/arm/plat-stm32mp1/conf.mk index 9009e009..26579f80 100644 --- a/core/arch/arm/plat-stm32mp1/conf.mk +++ b/core/arch/arm/plat-stm32mp1/conf.mk @@ -34,7 +34,6 @@ include core/arch/arm/cpu/cortex-a7.mk $(call force,CFG_BOOT_SECONDARY_REQUEST,y) $(call force,CFG_GIC,y) $(call force,CFG_INIT_CNTVOFF,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_PSCI_ARM32,y) $(call force,CFG_SCMI_MSG_DRIVERS,y) $(call force,CFG_SCMI_MSG_CLOCK,y) diff --git a/core/arch/arm/plat-sunxi/conf.mk b/core/arch/arm/plat-sunxi/conf.mk index 6931622a..e59e1946 100644 --- a/core/arch/arm/plat-sunxi/conf.mk +++ b/core/arch/arm/plat-sunxi/conf.mk @@ -2,7 +2,6 @@ PLATFORM_FLAVOR ?= bpi_zero $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_8250_UART,y) -$(call force,CFG_PM_STUBS,y) ifeq ($(PLATFORM_FLAVOR),bpi_zero) include core/arch/arm/cpu/cortex-a7.mk diff --git a/core/arch/arm/plat-sunxi/psci.c b/core/arch/arm/plat-sunxi/psci.c index e96fcf46..c387c80a 100644 --- a/core/arch/arm/plat-sunxi/psci.c +++ b/core/arch/arm/plat-sunxi/psci.c @@ -35,7 +35,6 @@ #include <kernel/boot.h> #include <kernel/misc.h> #include <kernel/panic.h> -#include <kernel/pm_stubs.h> #include <kernel/delay.h> #include <mm/core_mmu.h> #include <mm/core_memprot.h> diff --git a/core/arch/arm/plat-synquacer/conf.mk b/core/arch/arm/plat-synquacer/conf.mk index 1426939c..a63b3f29 100644 --- a/core/arch/arm/plat-synquacer/conf.mk +++ b/core/arch/arm/plat-synquacer/conf.mk @@ -3,7 +3,6 @@ PLATFORM_FLAVOR ?= developerbox $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_GIC,y) $(call force,CFG_PL011,y) -$(call force,CFG_PM_STUBS,y) include core/arch/arm/cpu/cortex-armv8-0.mk $(call force,CFG_TEE_CORE_NB_CORE,24) diff --git a/core/arch/arm/plat-ti/conf.mk b/core/arch/arm/plat-ti/conf.mk index 4e956524..11236411 100644 --- a/core/arch/arm/plat-ti/conf.mk +++ b/core/arch/arm/plat-ti/conf.mk @@ -37,7 +37,6 @@ endif #am43xx $(call force,CFG_8250_UART,y) $(call force,CFG_ARM32_core,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SM_PLATFORM_HANDLER,y) $(call force,CFG_GIC,y) ifneq ($(CFG_WITH_SOFTWARE_PRNG),y) diff --git a/core/arch/arm/plat-uniphier/conf.mk b/core/arch/arm/plat-uniphier/conf.mk index 695342f4..a83eff8a 100644 --- a/core/arch/arm/plat-uniphier/conf.mk +++ b/core/arch/arm/plat-uniphier/conf.mk @@ -30,7 +30,6 @@ $(call force,CFG_HWSUPP_MEM_PERM_PXN,y) $(call force,CFG_GIC,y) $(call force,CFG_ARM_GICV3,y) $(call force,CFG_8250_UART,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) $(call force,CFG_CORE_CLUSTER_SHIFT,1) diff --git a/core/arch/arm/plat-vexpress/conf.mk b/core/arch/arm/plat-vexpress/conf.mk index 682ce745..a6dbf6d4 100644 --- a/core/arch/arm/plat-vexpress/conf.mk +++ b/core/arch/arm/plat-vexpress/conf.mk @@ -31,7 +31,6 @@ endif $(call force,CFG_GIC,y) $(call force,CFG_PL011,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) ifeq ($(CFG_CORE_TPM_EVENT_LOG),y) diff --git a/core/arch/arm/plat-zynq7k/conf.mk b/core/arch/arm/plat-zynq7k/conf.mk index 9032b0fd..fa151657 100644 --- a/core/arch/arm/plat-zynq7k/conf.mk +++ b/core/arch/arm/plat-zynq7k/conf.mk @@ -6,7 +6,6 @@ $(call force,CFG_TEE_CORE_NB_CORE,2) $(call force,CFG_ARM32_core,y) $(call force,CFG_GIC,y) $(call force,CFG_CDNS_UART,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_WITH_SOFTWARE_PRNG,y) $(call force,CFG_PL310,y) $(call force,CFG_PL310_LOCKED,y) diff --git a/core/arch/arm/plat-zynqmp/conf.mk b/core/arch/arm/plat-zynqmp/conf.mk index 3309a57f..c296f478 100644 --- a/core/arch/arm/plat-zynqmp/conf.mk +++ b/core/arch/arm/plat-zynqmp/conf.mk @@ -5,7 +5,6 @@ include core/arch/arm/cpu/cortex-armv8-0.mk $(call force,CFG_TEE_CORE_NB_CORE,4) $(call force,CFG_CDNS_UART,y) $(call force,CFG_GIC,y) -$(call force,CFG_PM_STUBS,y) $(call force,CFG_SECURE_TIME_SOURCE_CNTPCT,y) $(call force,CFG_WITH_ARM_TRUSTED_FW,y) diff --git a/core/arch/arm/sm/pm.c b/core/arch/arm/sm/pm.c index 9dcc550c..04ba8814 100644 --- a/core/arch/arm/sm/pm.c +++ b/core/arch/arm/sm/pm.c @@ -13,7 +13,6 @@ #include <kernel/boot.h> #include <kernel/misc.h> #include <kernel/panic.h> -#include <kernel/pm_stubs.h> #include <kernel/thread.h> #include <kernel/tlb_helpers.h> #include <kernel/tz_ssvce_pl310.h> |