diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2019-04-18 10:07:01 +0200 |
|---|---|---|
| committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2019-05-02 13:58:09 +0200 |
| commit | 5c151b7e2c3f4414bb41d71005c6b30a58d3fe5c (patch) | |
| tree | 74585874a2b8648969939bb82f6f89f8595961cb | |
| parent | 8aeb6c94dd30546ae60b42ce7b8a80476bf9e67f (diff) | |
core: remove CFG_DYN_SHM_CAP
Removes the now obsolete CFG_DYN_SHM_CAP. CFG_CORE_DYN_SHM should be
used instead to enable/disable support for dynamic shared memory.
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
| -rw-r--r-- | core/arch/arm/tee/entry_fast.c | 2 | ||||
| -rw-r--r-- | mk/config.mk | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/core/arch/arm/tee/entry_fast.c b/core/arch/arm/tee/entry_fast.c index fe0576e2..92edde70 100644 --- a/core/arch/arm/tee/entry_fast.c +++ b/core/arch/arm/tee/entry_fast.c @@ -89,7 +89,7 @@ static void tee_entry_exchange_capabilities(struct thread_smc_args *args) args->a1 |= OPTEE_SMC_SEC_CAP_HAVE_RESERVED_SHM; #endif -#if defined(CFG_DYN_SHM_CAP) && defined(CFG_CORE_DYN_SHM) +#if defined(CFG_CORE_DYN_SHM) dyn_shm_en = core_mmu_nsec_ddr_is_defined(); if (dyn_shm_en) args->a1 |= OPTEE_SMC_SEC_CAP_DYNAMIC_SHM; diff --git a/mk/config.mk b/mk/config.mk index 85689c18..ec75bfb4 100644 --- a/mk/config.mk +++ b/mk/config.mk @@ -410,13 +410,6 @@ CFG_CORE_DYN_SHM ?= y # memory area). CFG_CORE_RESERVED_SHM ?= y -# Do not report to NW that dynamic shared memory (shared memory outside -# predefined region) is enabled. -# Note that you can disable this feature for debug purposes. OP-TEE will not -# report to Normal World that it support dynamic SHM. But, nevertheles it -# will accept dynamic SHM buffers. -CFG_DYN_SHM_CAP ?= $(CFG_CORE_DYN_SHM) - # Enables support for larger physical addresses, that is, it will define # paddr_t as a 64-bit type. CFG_CORE_LARGE_PHYS_ADDR ?= n |