Merge "dtsi: Update the nv-counter node in the device tree" into integration

This commit is contained in:
Alexei Fedorov 2020-09-02 12:14:43 +00:00 committed by TrustedFirmware Code Review
commit ee99356b78
2 changed files with 19 additions and 8 deletions

View File

@ -6,6 +6,7 @@
#include <tools_share/tbbr_oid.h>
#include <common/tbbr/tbbr_img_def.h>
#include <common/nv_cntr_ids.h>
cot {
manifests {
@ -301,18 +302,19 @@ cot {
};
};
non-volatile-counters {
non_volatile_counters: non_volatile_counters {
compatible = "arm, non-volatile-counter";
#address-cells = <1>;
#size-cells = <0>;
counters {
trusted_nv_counter: trusted_nv_counter {
oid = TRUSTED_FW_NVCOUNTER_OID;
};
non_trusted_nv_counter: non_trusted_nv_counter {
oid = NON_TRUSTED_FW_NVCOUNTER_OID;
};
trusted_nv_counter: trusted_nv_counter {
id = <TRUSTED_NV_CTR_ID>;
oid = TRUSTED_FW_NVCOUNTER_OID;
};
non_trusted_nv_counter: non_trusted_nv_counter {
id = <NON_TRUSTED_NV_CTR_ID>;
oid = NON_TRUSTED_FW_NVCOUNTER_OID;
};
};

View File

@ -0,0 +1,9 @@
/*
* Copyright (c) 2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#define TRUSTED_NV_CTR_ID U(0)
#define NON_TRUSTED_NV_CTR_ID U(1)
#define MAX_NV_CTR_IDS U(2)