andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "SPMC: adjust device region for first secure partition" into integration

This commit is contained in:
Olivier Deprez 2020-10-26 09:51:32 +00:00 committed by TrustedFirmware Code Review
parent 95fca1101e d0d63afeb4
commit 00ad74c7af
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
View File

@ -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 */
};

9
plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
View File

@ -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 */
};