diff options
author | Olivier Deprez <olivier.deprez@arm.com> | 2020-10-26 09:51:32 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-10-26 09:51:32 +0000 |
commit | 00ad74c7afe67b2ffaf08300710f18d3dafebb45 (patch) | |
tree | 5b9378730c9ba68d014506812023346e2f3fb021 /plat/arm | |
parent | 95fca1101eb418f23b5c59825551c1cccbeda8a6 (diff) | |
parent | d0d63afeb440c4ccc8a5685130f1b8de1536eec2 (diff) |
Merge "SPMC: adjust device region for first secure partition" into integration
Diffstat (limited to 'plat/arm')
-rw-r--r-- | plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts | 20 | ||||
-rw-r--r-- | plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts | 9 |
2 files changed, 21 insertions, 8 deletions
diff --git a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts index 934a01afc..8b9c281e2 100644 --- a/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts +++ b/plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts @@ -5,13 +5,12 @@ */ /dts-v1/; -#define AFF 00 +#define AFF 00 #include "fvp-defs.dtsi" #undef POST -#define POST \ - enable-method = "psci"; \ - }; +#define POST \ + }; / { compatible = "arm,ffa-core-manifest-1.0"; @@ -61,7 +60,11 @@ #size-cells = <0x0>; CPU_0 - /* SPM(Hafnium) requires secondary cpu nodes are declared in descending order */ + + /* + * SPMC (Hafnium) requires secondary core nodes are declared + * in descending order. + */ CPU_7 CPU_6 CPU_5 @@ -71,7 +74,12 @@ CPU_1 }; - memory@60000000 { + device-memory@0 { + device_type = "device-memory"; + reg = <0x0 0x0 0x6000000 0x0 0x8000000 0x78000000>; + }; + + memory@6000000 { device_type = "memory"; reg = <0x0 0x6000000 0x2000000>; /* Trusted DRAM */ }; diff --git a/plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts b/plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts index f5b31b43c..266adfc2b 100644 --- a/plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts +++ b/plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts @@ -49,7 +49,7 @@ CPU_0 /* - * SPMC(Hafnium) requires secondary core nodes are declared + * SPMC (Hafnium) requires secondary core nodes are declared * in descending order. */ CPU_7 @@ -61,7 +61,12 @@ CPU_1 }; - memory@60000000 { + device-memory@0 { + device_type = "device-memory"; + reg = <0x0 0x0 0x6000000 0x0 0x8000000 0x78000000>; + }; + + memory@6000000 { device_type = "memory"; reg = <0x0 0x6000000 0x2000000>; /* Trusted DRAM */ }; |