github
/
arm-trusted-firmware
mirror of https://github.com/ARM-software/arm-trusted-firmware.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

refactor(st): align the NV counter naming 

align the nv counter naming for stm32mp1-cot-descriptor.dtsi file

Change-Id: I8c41c5e323e8bf867e08b4590dfb42e86204ab65
Signed-off-by: Xialin Liu <Xialin.Liu@ARM.com>
pull/2005/merge
Xialin Liu 4 months ago
committed by Manish V Badarkhe
parent
04d02a9c0b
commit
b6a95c4a80
1 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      fdts/stm32mp1-cot-descriptors.dtsi

18
fdts/stm32mp1-cot-descriptors.dtsi
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2020-2022, ARM Limited. All rights reserved. * Copyright (c) 2020-2024, ARM Limited. All rights reserved.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -15,7 +15,7 @@ cot {
stm32mp_cfg_cert: stm32mp_cfg_cert { stm32mp_cfg_cert: stm32mp_cfg_cert {
root-certificate; root-certificate;
image-id = <STM32MP_CONFIG_CERT_ID>; image-id = <STM32MP_CONFIG_CERT_ID>;
antirollback-counter = <&trusted_nv_counter>; antirollback-counter = <&trusted_nv_ctr>;
hw_config_hash: hw_config_hash { hw_config_hash: hw_config_hash {
oid = HW_CONFIG_HASH_OID; oid = HW_CONFIG_HASH_OID;
@ -29,7 +29,7 @@ cot {
trusted_key_cert: trusted_key_cert { trusted_key_cert: trusted_key_cert {
root-certificate; root-certificate;
image-id = <TRUSTED_KEY_CERT_ID>; image-id = <TRUSTED_KEY_CERT_ID>;
antirollback-counter = <&trusted_nv_counter>; antirollback-counter = <&trusted_nv_ctr>;
trusted_world_pk: trusted_world_pk { trusted_world_pk: trusted_world_pk {
oid = TRUSTED_WORLD_PK_OID; oid = TRUSTED_WORLD_PK_OID;
@ -43,7 +43,7 @@ cot {
image-id = <TRUSTED_OS_FW_KEY_CERT_ID>; image-id = <TRUSTED_OS_FW_KEY_CERT_ID>;
parent = <&trusted_key_cert>; parent = <&trusted_key_cert>;
signing-key = <&trusted_world_pk>; signing-key = <&trusted_world_pk>;
antirollback-counter = <&trusted_nv_counter>; antirollback-counter = <&trusted_nv_ctr>;
tos_fw_content_pk: tos_fw_content_pk { tos_fw_content_pk: tos_fw_content_pk {
oid = TRUSTED_OS_FW_CONTENT_CERT_PK_OID; oid = TRUSTED_OS_FW_CONTENT_CERT_PK_OID;
@ -54,7 +54,7 @@ cot {
image-id = <TRUSTED_OS_FW_CONTENT_CERT_ID>; image-id = <TRUSTED_OS_FW_CONTENT_CERT_ID>;
parent = <&trusted_os_fw_key_cert>; parent = <&trusted_os_fw_key_cert>;
signing-key = <&tos_fw_content_pk>; signing-key = <&tos_fw_content_pk>;
antirollback-counter = <&trusted_nv_counter>; antirollback-counter = <&trusted_nv_ctr>;
tos_fw_hash: tos_fw_hash { tos_fw_hash: tos_fw_hash {
oid = TRUSTED_OS_FW_HASH_OID; oid = TRUSTED_OS_FW_HASH_OID;
@ -74,7 +74,7 @@ cot {
image-id = <NON_TRUSTED_FW_KEY_CERT_ID>; image-id = <NON_TRUSTED_FW_KEY_CERT_ID>;
parent = <&trusted_key_cert>; parent = <&trusted_key_cert>;
signing-key = <&non_trusted_world_pk>; signing-key = <&non_trusted_world_pk>;
antirollback-counter = <&non_trusted_nv_counter>; antirollback-counter = <&non_trusted_nv_ctr>;
nt_fw_content_pk: nt_fw_content_pk { nt_fw_content_pk: nt_fw_content_pk {
oid = NON_TRUSTED_FW_CONTENT_CERT_PK_OID; oid = NON_TRUSTED_FW_CONTENT_CERT_PK_OID;
@ -85,7 +85,7 @@ cot {
image-id = <NON_TRUSTED_FW_CONTENT_CERT_ID>; image-id = <NON_TRUSTED_FW_CONTENT_CERT_ID>;
parent = <&non_trusted_fw_key_cert>; parent = <&non_trusted_fw_key_cert>;
signing-key = <&nt_fw_content_pk>; signing-key = <&nt_fw_content_pk>;
antirollback-counter = <&non_trusted_nv_counter>; antirollback-counter = <&non_trusted_nv_ctr>;
nt_world_bl_hash: nt_world_bl_hash { nt_world_bl_hash: nt_world_bl_hash {
oid = NON_TRUSTED_WORLD_BOOTLOADER_HASH_OID; oid = NON_TRUSTED_WORLD_BOOTLOADER_HASH_OID;
@ -144,12 +144,12 @@ non_volatile_counters: non_volatile_counters {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
trusted_nv_counter: trusted_nv_counter { trusted_nv_ctr: trusted_nv_ctr {
id = <TRUSTED_NV_CTR_ID>; id = <TRUSTED_NV_CTR_ID>;
oid = TRUSTED_FW_NVCOUNTER_OID; oid = TRUSTED_FW_NVCOUNTER_OID;
}; };
non_trusted_nv_counter: non_trusted_nv_counter { non_trusted_nv_ctr: non_trusted_nv_ctr {
id = <NON_TRUSTED_NV_CTR_ID>; id = <NON_TRUSTED_NV_CTR_ID>;
oid = NON_TRUSTED_FW_NVCOUNTER_OID; oid = NON_TRUSTED_FW_NVCOUNTER_OID;
}; };

Write Preview
Loading…
Cancel
Save