mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-29 00:33:49 +00:00
feat(ff-a): update FF-A version to v1.2
Bump the required FF-A version in framework and manifests to v1.2 as upstream feature development goes. Signed-off-by: Kathleen Capella <kathleen.capella@arm.com> Change-Id: I09d936d4aad89965cfd13f58741d647223b63a34
This commit is contained in:
parent
1c724b5c60
commit
e830e4cdee
5 changed files with 8 additions and 6 deletions
|
@ -34,7 +34,7 @@
|
||||||
#define FFA_VERSION_MAJOR U(1)
|
#define FFA_VERSION_MAJOR U(1)
|
||||||
#define FFA_VERSION_MAJOR_SHIFT 16
|
#define FFA_VERSION_MAJOR_SHIFT 16
|
||||||
#define FFA_VERSION_MAJOR_MASK U(0x7FFF)
|
#define FFA_VERSION_MAJOR_MASK U(0x7FFF)
|
||||||
#define FFA_VERSION_MINOR U(1)
|
#define FFA_VERSION_MINOR U(2)
|
||||||
#define FFA_VERSION_MINOR_SHIFT 0
|
#define FFA_VERSION_MINOR_SHIFT 0
|
||||||
#define FFA_VERSION_MINOR_MASK U(0xFFFF)
|
#define FFA_VERSION_MINOR_MASK U(0xFFFF)
|
||||||
#define FFA_VERSION_BIT31_MASK U(0x1u << 31)
|
#define FFA_VERSION_BIT31_MASK U(0x1u << 31)
|
||||||
|
@ -119,6 +119,8 @@
|
||||||
#define FFA_FNUM_SECONDARY_EP_REGISTER U(0x87)
|
#define FFA_FNUM_SECONDARY_EP_REGISTER U(0x87)
|
||||||
#define FFA_FNUM_MEM_PERM_GET U(0x88)
|
#define FFA_FNUM_MEM_PERM_GET U(0x88)
|
||||||
#define FFA_FNUM_MEM_PERM_SET U(0x89)
|
#define FFA_FNUM_MEM_PERM_SET U(0x89)
|
||||||
|
|
||||||
|
/* FF-A v1.2 */
|
||||||
#define FFA_FNUM_PARTITION_INFO_GET_REGS U(0x8B)
|
#define FFA_FNUM_PARTITION_INFO_GET_REGS U(0x8B)
|
||||||
#define FFA_FNUM_EL3_INTR_HANDLE U(0x8C)
|
#define FFA_FNUM_EL3_INTR_HANDLE U(0x8C)
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
attribute {
|
attribute {
|
||||||
spmc_id = <0x8000>;
|
spmc_id = <0x8000>;
|
||||||
maj_ver = <0x1>;
|
maj_ver = <0x1>;
|
||||||
min_ver = <0x1>;
|
min_ver = <0x2>;
|
||||||
exec_state = <0x0>;
|
exec_state = <0x0>;
|
||||||
load_address = <0x0 0x6000000>;
|
load_address = <0x0 0x6000000>;
|
||||||
entrypoint = <0x0 0x6000000>;
|
entrypoint = <0x0 0x6000000>;
|
||||||
|
|
|
@ -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
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -20,7 +20,7 @@
|
||||||
attribute {
|
attribute {
|
||||||
spmc_id = <0x8000>;
|
spmc_id = <0x8000>;
|
||||||
maj_ver = <0x1>;
|
maj_ver = <0x1>;
|
||||||
min_ver = <0x1>;
|
min_ver = <0x2>;
|
||||||
exec_state = <0x0>;
|
exec_state = <0x0>;
|
||||||
load_address = <0x0 0x6000000>;
|
load_address = <0x0 0x6000000>;
|
||||||
entrypoint = <0x0 0x6000000>;
|
entrypoint = <0x0 0x6000000>;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
attribute {
|
attribute {
|
||||||
spmc_id = <0x8000>;
|
spmc_id = <0x8000>;
|
||||||
maj_ver = <0x1>;
|
maj_ver = <0x1>;
|
||||||
min_ver = <0x1>;
|
min_ver = <0x2>;
|
||||||
exec_state = <0x0>;
|
exec_state = <0x0>;
|
||||||
load_address = <0x0 0xfd000000>;
|
load_address = <0x0 0xfd000000>;
|
||||||
entrypoint = <0x0 0xfd000000>;
|
entrypoint = <0x0 0xfd000000>;
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
attribute {
|
attribute {
|
||||||
spmc_id = <0x8000>;
|
spmc_id = <0x8000>;
|
||||||
maj_ver = <0x1>;
|
maj_ver = <0x1>;
|
||||||
min_ver = <0x1>;
|
min_ver = <0x2>;
|
||||||
exec_state = <0x0>;
|
exec_state = <0x0>;
|
||||||
load_address = <0x0 0xfd000000>;
|
load_address = <0x0 0xfd000000>;
|
||||||
entrypoint = <0x0 0xfd000000>;
|
entrypoint = <0x0 0xfd000000>;
|
||||||
|
|
Loading…
Add table
Reference in a new issue