diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2019-04-18 10:04:16 +0200 |
|---|---|---|
| committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2019-05-02 13:58:09 +0200 |
| commit | 8aeb6c94dd30546ae60b42ce7b8a80476bf9e67f (patch) | |
| tree | 9f202650e06bca005eb2baf8197c5c4c2a79704b /core/arch/arm/kernel | |
| parent | 37a6b717787bf3927f7af379ae66b1b6d0fe2a51 (diff) | |
core: introduce CFG_CORE_RESERVED_SHM
Introduces CFG_CORE_RESERVED_SHM which if set to y enables reserved shared
memory, else disables support for reserved shared memory.
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'core/arch/arm/kernel')
| -rw-r--r-- | core/arch/arm/kernel/generic_boot.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/arch/arm/kernel/generic_boot.c b/core/arch/arm/kernel/generic_boot.c index 893e6468..64fd24a6 100644 --- a/core/arch/arm/kernel/generic_boot.c +++ b/core/arch/arm/kernel/generic_boot.c @@ -876,6 +876,7 @@ static struct core_mmu_phys_mem *get_memory(void *fdt, size_t *nelems) } #endif /*CFG_CORE_DYN_SHM*/ +#ifdef CFG_CORE_RESERVED_SHM static int mark_static_shm_as_reserved(struct dt_descriptor *dt) { vaddr_t shm_start; @@ -890,6 +891,7 @@ static int mark_static_shm_as_reserved(struct dt_descriptor *dt) DMSG("No SHM configured"); return -1; } +#endif /*CFG_CORE_RESERVED_SHM*/ static void init_external_dt(unsigned long phys_dt) { @@ -956,8 +958,10 @@ static void update_external_dt(void) if (config_psci(dt)) panic("Failed to config PSCI"); +#ifdef CFG_CORE_RESERVED_SHM if (mark_static_shm_as_reserved(dt)) panic("Failed to config non-secure memory"); +#endif if (mark_tzdram_as_reserved(dt)) panic("Failed to config secure memory"); |