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

Merge changes from topic "tc0_tfa_v25" into integration 

* changes:
  fix(tc0): remove ffa and optee device tree node
  fix(tc0): set cactus-tertiary vcpu count to 1
  fix(tc0): change UUID to string format
This commit is contained in:
Olivier Deprez 2021-06-30 12:06:13 +02:00 committed by TrustedFirmware Code Review
parent 81a8b2da2c f1b44a9050
commit 00aa63d104
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fdts/tc0.dts
View File

@ -440,16 +440,4 @@
};
};
ffa {
compatible = "arm,ffa";
conduit = "smc";
mem_share_buffer = "tx";
};
firmware {
optee {
compatible = "linaro,optee-tz";
method = "ffa";
};
};
};

4
plat/arm/board/tc0/fdts/tc0_spmc_manifest.dts
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Arm Limited. All rights reserved.
* Copyright (c) 2020-2021, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -40,7 +40,7 @@
is_ffa_partition;
debug_name = "cactus-tertiary";
load_address = <0xfe200000>;
vcpu_count = <8>;
vcpu_count = <1>;
mem_size = <1048576>;
};
};

8
plat/arm/board/tc0/fdts/tc0_tb_fw_config.dts
View File

@ -39,24 +39,24 @@
#endif
#if OPTEE_SP_FW_CONFIG
op-tee {
uuid = <0x486178e0 0xe7f811e3 0xbc5e0002 0xa5d5c51b>;
uuid = "486178e0-e7f8-11e3-bc5e-0002a5d5c51b";
load-address = <0xfd280000>;
};
#else
cactus-primary {
uuid = <0xb4b5671e 0x4a904fe1 0xb81ffb13 0xdae1dacb>;
uuid = "b4b5671e-4a90-4fe1-b81f-fb13dae1dacb";
load-address = <0xfe000000>;
owner = "SiP";
};
cactus-secondary {
uuid = <0xd1582309 0xf02347b9 0x827c4464 0xf5578fc8>;
uuid = "d1582309-f023-47b9-827c-4464f5578fc8";
load-address = <0xfe100000>;
owner = "Plat";
};
cactus-tertiary {
uuid = <0x79b55c73 0x1d8c44b9 0x859361e1 0x770ad8d2>;
uuid = "79b55c73-1d8c-44b9-8593-61e1770ad8d2";
load-address = <0xfe200000>;
};
#endif