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

fix(spm): add device-regions used in tf-a-tests

Browse source 
Device memory region specified in an SP manifest are now validated
against the device memory defined in the SPMC manifest. Therefore
we need to add the device memory used in the tf-a-tests to the SPMC
manifests.

Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
Change-Id: I47376e67c700705d12338d7078292618a15d5546
This commit is contained in:
Daniel Boulby 2024-03-14 16:01:59 +00:00 • committed by J-Alves
parent c8be7c08c3
commit 45716e377e
3 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020-2023, Arm Limited. All rights reserved.
* Copyright (c) 2020-2024, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@ -96,6 +96,15 @@
<0x0 0x88000000 0x0 0x10000000>;
};
memory@2 {
device_type = "device-memory";
reg = <0x0 0x1c090000 0x0 0x40000>, /* UART */
<0x0 0x2bfe0000 0x0 0x20000>, /* SMMUv3TestEngine */
<0x0 0x2a490000 0x0 0x20000>, /* SP805 Trusted Watchdog */
<0x0 0x1c130000 0x0 0x10000>; /* Virtio block device */
};
#if MEASURED_BOOT
#include "event_log.dtsi"
#endif

5
plat/arm/board/fvp/fdts/fvp_spmc_optee_sp_manifest.dts
View file

@ -68,4 +68,9 @@
reg = <0x00008800 0x80000000 0x0 0x7f000000>,
<0x0 0x88000000 0x0 0x10000000>;
};
memory@0 {
device_type = "device-memory";
reg = <0x0 0x1c090000 0x0 0x40000>; /* UART */
};
};

5
plat/arm/board/tc/fdts/tc_spmc_manifest.dtsi
View file

@ -107,4 +107,9 @@
<HI(PLAT_ARM_DRAM2_BASE) LO(PLAT_ARM_DRAM2_BASE)
HI(TC_NS_DRAM2_SIZE) LO(TC_NS_DRAM2_SIZE)>;
};
memory@2 {
device_type = "device-memory";
reg = <0x0 0x1c130000 0x0 0x10000>; /* Virtio block device */
};
};