From d824ee371adf0051631a0b89b80195fd8b3a5e64 Mon Sep 17 00:00:00 2001 From: Bence Balogh Date: Mon, 2 Dec 2024 10:02:15 +0000 Subject: [PATCH] arm-bsp/trusted-firmware-m: corstone1000: Fix Secure Debug connection due to token version mismatch 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 Signed-off-by: Jon Mason --- .../0001-PSA-revert-header-versions.patch | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch index 5bc65c40..47db1866 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/corstone1000/psa-adac/0001-PSA-revert-header-versions.patch @@ -14,28 +14,25 @@ certificate/token versions. Signed-off-by: Emekcan Aras Upstream-Status: Inappropriate [Add newer dummy token and cert] --- - psa-adac/core/include/psa_adac.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + psa-adac/core/include/psa_adac.h | 4 ++-- + 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 -index b190992..b026607 100644 +index b190992..6c3feb2 100644 --- a/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. */ -#define ADAC_CERT_MAJOR 1u -#define ADAC_CERT_MINOR 0u --#define ADAC_TOKEN_MAJOR 1u --#define ADAC_TOKEN_MINOR 0u +#define ADAC_CERT_MAJOR 0u +#define ADAC_CERT_MINOR 1u -+#define ADAC_TOKEN_MAJOR 0u -+#define ADAC_TOKEN_MINOR 1u + #define ADAC_TOKEN_MAJOR 1u + #define ADAC_TOKEN_MINOR 0u - /** \brief Key options - * -- -2.17.1 +2.25.1 +