mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-07 04:58:57 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/trusted-firmware-m: corstone1000: Fix Secure Debug connection due to token version mismatch

Browse Source 
Due to a mismatch between the ADAC dummy token major version and the version
in the secure-debug-manager repository [1]'s submodule [2], the secure debug connection was denied.
Update the ADAC token major and minor versions in TF-M to align with the expected
dummy token.

[1] https://github.com/ARM-software/secure-debug-manager/
[2] https://git.trustedfirmware.org/plugins/gitiles/shared/psa-adac.git/+/refs/heads/master/psa-adac/core/include/psa_adac.h

Fixes: 7e9466 ("arm-bsp/trusted-firmware-m: corstone1000: add Secure Debug")
Signed-off-by: Bence Balogh <bence.balogh@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Bence Balogh
2024-12-02 10:02:15 +00:00
committed by Jon Mason
parent acafe7c89f
commit d824ee371a
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch
+8 -11
View File
@@ -14,28 +14,25 @@ certificate/token versions.
Signed-off-by: Emekcan Aras <emekcan.aras@arm.com> Signed-off-by: Emekcan Aras <emekcan.aras@arm.com>
Upstream-Status: Inappropriate [Add newer dummy token and cert] Upstream-Status: Inappropriate [Add newer dummy token and cert]
--- ---
psa-adac/core/include/psa_adac.h | 8 ++++---- psa-adac/core/include/psa_adac.h | 4 ++--
1 file changed, 4 insertions(+), 4 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/psa-adac/core/include/psa_adac.h b/psa-adac/core/include/psa_adac.h diff --git a/psa-adac/core/include/psa_adac.h b/psa-adac/core/include/psa_adac.h
index b190992..b026607 100644 index b190992..6c3feb2 100644
--- a/psa-adac/core/include/psa_adac.h --- a/psa-adac/core/include/psa_adac.h
+++ b/psa-adac/core/include/psa_adac.h +++ b/psa-adac/core/include/psa_adac.h
@@ -30,10 +30,10 @@ extern "C" { @@ -30,8 +30,8 @@ extern "C" {
* *
* Current version numbers for certificate and token format. * Current version numbers for certificate and token format.
*/ */
-#define ADAC_CERT_MAJOR 1u -#define ADAC_CERT_MAJOR 1u
-#define ADAC_CERT_MINOR 0u -#define ADAC_CERT_MINOR 0u
-#define ADAC_TOKEN_MAJOR 1u
-#define ADAC_TOKEN_MINOR 0u
+#define ADAC_CERT_MAJOR 0u +#define ADAC_CERT_MAJOR 0u
+#define ADAC_CERT_MINOR 1u +#define ADAC_CERT_MINOR 1u
+#define ADAC_TOKEN_MAJOR 0u #define ADAC_TOKEN_MAJOR 1u
+#define ADAC_TOKEN_MINOR 1u #define ADAC_TOKEN_MINOR 0u
/** \brief Key options
*
-- --
2.17.1 2.25.1