Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame^] | 1 | From 35dba075593cb32c62b881e7763fcf0ea37908f7 Mon Sep 17 00:00:00 2001 |
| 2 | From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 3 | Date: Mon, 23 May 2022 11:32:41 +0100 |
| 4 | Subject: [PATCH 2/2] plat-totalcompute: fix TZDRAM start and size |
| 5 | |
| 6 | - Fix TZDRAM_SIZE in TC platform |
| 7 | - For CFG_CORE_SEL2_SPMC, manifest size is increased from 0x1000 to |
| 8 | 0x4000 for boot protocol support. |
| 9 | |
| 10 | Upstream-Status: Pending [Not submitted to upstream yet] |
| 11 | |
| 12 | Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 13 | Change-Id: Iff19c498e9edae961f469604d69419c1a32145f5 |
| 14 | --- |
| 15 | core/arch/arm/plat-totalcompute/conf.mk | 5 +++-- |
| 16 | core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts | 2 +- |
| 17 | 2 files changed, 4 insertions(+), 3 deletions(-) |
| 18 | |
| 19 | diff --git a/core/arch/arm/plat-totalcompute/conf.mk b/core/arch/arm/plat-totalcompute/conf.mk |
| 20 | index b39ac0f0..2f6c0ee1 100644 |
| 21 | --- a/core/arch/arm/plat-totalcompute/conf.mk |
| 22 | +++ b/core/arch/arm/plat-totalcompute/conf.mk |
| 23 | @@ -32,8 +32,9 @@ ifeq ($(CFG_CORE_SEL1_SPMC),y) |
| 24 | CFG_TZDRAM_START ?= 0xfd000000 |
| 25 | CFG_TZDRAM_SIZE ?= 0x02000000 |
| 26 | else ifeq ($(CFG_CORE_SEL2_SPMC),y) |
| 27 | -CFG_TZDRAM_START ?= 0xfd281000 |
| 28 | -CFG_TZDRAM_SIZE ?= 0x01d7f000 |
| 29 | +CFG_TZDRAM_START ?= 0xfd284000 |
| 30 | +# TZDRAM size 0x1980000 - 0x4000 manifest size |
| 31 | +CFG_TZDRAM_SIZE ?= 0x0197c000 |
| 32 | else |
| 33 | CFG_TZDRAM_START ?= 0xff000000 |
| 34 | CFG_TZDRAM_SIZE ?= 0x01000000 |
| 35 | diff --git a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts |
| 36 | index 00cfa5b2..56e69f37 100644 |
| 37 | --- a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts |
| 38 | +++ b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts |
| 39 | @@ -20,7 +20,7 @@ |
| 40 | exception-level = <2>; /* S-EL1 */ |
| 41 | execution-state = <0>; /* AARCH64 */ |
| 42 | load-address = <0xfd280000>; |
| 43 | - entrypoint-offset = <0x1000>; |
| 44 | + entrypoint-offset = <0x4000>; |
| 45 | xlat-granule = <0>; /* 4KiB */ |
| 46 | boot-order = <0>; |
| 47 | messaging-method = <0x3>; /* Direct request/response supported */ |
| 48 | -- |
| 49 | 2.34.1 |
| 50 | |