mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-15 17:14:21 +00:00
Merge "fix(spm): add device-regions used in tf-a-tests" into integration
This commit is contained in:
commit
eb69206f00
3 changed files with 20 additions and 1 deletions
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
};
|
||||
};
|
||||
|
|
|
@ -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 */
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Reference in a new issue