Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-26 06:50:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "feat(fvp): define ns memory in the SPMC manifest" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2023-05-04 15:21:54 +02:00 • committed by TrustedFirmware Code Review
commit c194aa0c6c
2 changed files with 24 additions and 9 deletions
plat/arm/board
fvp/fdts
fvp_spmc_manifest.dts
tc/fdts
tc_spmc_manifest.dts

16
plat/arm/board/fvp/fdts/fvp_spmc_manifest.dts
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2022, Arm Limited. All rights reserved.
* Copyright (c) 2020-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -15,7 +15,7 @@
/ {
compatible = "arm,ffa-core-manifest-1.0";
#address-cells = <2>;
#size-cells = <1>;
#size-cells = <2>;
attribute {
spmc_id = <0x8000>;
@ -78,9 +78,17 @@
CPU_1
};
memory@6000000 {
memory@0 {
device_type = "memory";
reg = <0x0 0x6000000 0x2000000>; /* Trusted DRAM */
reg = <0x0 0xfd000000 0x0 0x2000000>,
<0x0 0x7000000 0x0 0x1000000>,
<0x0 0xff000000 0x0 0x1000000>;
};
memory@1 {
device_type = "ns-memory";
reg = <0x00008800 0x80000000 0x0 0x7f000000>,
<0x0 0x88000000 0x0 0x10000000>;
};
#if MEASURED_BOOT

17
plat/arm/board/tc/fdts/tc_spmc_manifest.dts
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2021, Arm Limited. All rights reserved.
* Copyright (c) 2020-2023, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -8,7 +8,7 @@
/ {
compatible = "arm,ffa-core-manifest-1.0";
#address-cells = <2>;
#size-cells = <1>;
#size-cells = <2>;
attribute {
spmc_id = <0x8000>;
@ -117,9 +117,16 @@
};
};
/* 32MB of TC_TZC_DRAM1_BASE */
memory@fd000000 {
memory@0 {
device_type = "memory";
reg = <0x0 0xfd000000 0x2000000>;
reg = <0x0 0xfd000000 0x0 0x2000000>,
<0x0 0x7000000 0x0 0x1000000>,
<0x0 0xff000000 0x0 0x1000000>;
};
memory@1 {
device_type = "ns-memory";
reg = <0x00008800 0x80000000 0x0 0x7f000000>,
<0x0 0x88000000 0x1 0x00000000>;
};
};