diff options
| -rw-r--r-- | fdts/cot_descriptors.dtsi | 18 | ||||
| -rw-r--r-- | include/common/nv_cntr_ids.h | 9 |
2 files changed, 19 insertions, 8 deletions
diff --git a/fdts/cot_descriptors.dtsi b/fdts/cot_descriptors.dtsi index 9308e1789..411bae6c1 100644 --- a/fdts/cot_descriptors.dtsi +++ b/fdts/cot_descriptors.dtsi @@ -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; }; }; diff --git a/include/common/nv_cntr_ids.h b/include/common/nv_cntr_ids.h new file mode 100644 index 000000000..a15c431d0 --- /dev/null +++ b/include/common/nv_cntr_ids.h @@ -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) |