similarity index 97%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0009-platform-corstone1000-Add-CORSTONE_1000_TYPE-variabl.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0001-platform-corstone1000-Add-CORSTONE_1000_TYPE-variabl.patch
@@ -1,7 +1,7 @@
From 2cd4db9828f244de77e402ad31c52d9c4ba3c600 Mon Sep 17 00:00:00 2001
From: Hugues KAMBA MPIANA <hugues.kambampiana@arm.com>
Date: Tue, 5 Aug 2025 14:05:49 +0100
-Subject: [PATCH 1/7] platform: corstone1000: Add CORSTONE_1000_TYPE variable
+Subject: [PATCH] platform: corstone1000: Add CORSTONE_1000_TYPE variable
for platform selection
This change introduces a CORSTONE_1000_TYPE variable in both CMake
similarity index 99%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0016-platform-corstone1000-Add-event-provider-proxy.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0002-platform-corstone1000-Add-event-provider-proxy-for-b.patch
@@ -1,7 +1,7 @@
From 6a4cedce9d433bc42a71ac77c3cd90dde4242951 Mon Sep 17 00:00:00 2001
From: Hugues KAMBA MPIANA <hugues.kambampiana@arm.com>
Date: Tue, 5 Aug 2025 15:22:44 +0100
-Subject: [PATCH 2/7] platform: corstone1000: Add event provider proxy for boot
+Subject: [PATCH] platform: corstone1000: Add event provider proxy for boot
confirmation handling
This patch introduces an event forwarding framework to support
similarity index 99%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0017-platform-corstone1000-Define-GUID-for-each-payloads.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0003-fwu-se-proxy-Allow-platform-override-of-FWU-mapping-.patch
@@ -1,7 +1,7 @@
From a518c74b7ce050bba2d0aaece701086dc50ffa53 Mon Sep 17 00:00:00 2001
From: Hugues KAMBA MPIANA <hugues.kambampiana@arm.com>
Date: Tue, 5 Aug 2025 13:54:13 +0100
-Subject: [PATCH 3/7] fwu:se-proxy: Allow platform override of FWU mapping and
+Subject: [PATCH] fwu:se-proxy: Allow platform override of FWU mapping and
payload size
Allow platform override of FWU mapping and payload size
similarity index 97%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0013-Fix-PSA-FWU-IPC-psa_fwu_install-return-value-check.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0004-fwu-Coerce-PSA_SUCCESS_REBOOT-and-PSA_SUCCESS_RESTAR.patch
@@ -1,7 +1,7 @@
From 8b8eb4a2d512de06d3ee8a17dd9295cd38efd68d Mon Sep 17 00:00:00 2001
From: Hugues KAMBA MPIANA <hugues.kambampiana@arm.com>
Date: Tue, 5 Aug 2025 14:42:17 +0100
-Subject: [PATCH 4/7] fwu: Coerce PSA_SUCCESS_REBOOT and PSA_SUCCESS_RESTART to
+Subject: [PATCH] fwu: Coerce PSA_SUCCESS_REBOOT and PSA_SUCCESS_RESTART to
PSA_SUCCESS
Map `PSA_SUCCESS_REBOOT` and `PSA_SUCCESS_RESTART` (returned by
similarity index 100%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0018-Add-the-com-buffer-address-and-page-count.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0005-platform-corstone1000-Add-MM-communication-buffer-co.patch
similarity index 99%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0014-fwu-Add-EFI-ESRT-v1-support.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0006-fwu-Add-support-for-ESRT-v1-in-PSA-FWU-M-agent.patch
@@ -1,7 +1,7 @@
From d5ca8c5b73c3ff3bc5c137828932e440c6a7f187 Mon Sep 17 00:00:00 2001
From: Hugues KAMBA MPIANA <hugues.kambampiana@arm.com>
Date: Tue, 5 Aug 2025 15:05:33 +0100
-Subject: [PATCH 5/7] fwu: Add support for ESRT v1 in PSA FWU-M agent
+Subject: [PATCH] fwu: Add support for ESRT v1 in PSA FWU-M agent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
similarity index 99%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0022-Make-treating-warnings-as-errors-configurable.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0007-Make-treating-warnings-as-errors-configurable.patch
@@ -1,7 +1,7 @@
From 44e56b28f6a5ea9caab0bcccce3d02c59bb5d0ce Mon Sep 17 00:00:00 2001
From: Gyorgy Szing <gyorgy.szing@arm.com>
Date: Tue, 19 Aug 2025 11:07:39 +0200
-Subject: [PATCH 1/8] Make treating warnings as errors configurable
+Subject: [PATCH] Make treating warnings as errors configurable
Introduce the CMAKE_COMPILE_WARNING_AS_ERROR build option to control
whether the project treats compiler warnings as errors. This option is
similarity index 95%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0003-Remove-Werror-flag.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0008-smm-gateway-config-Remove-Werror-compile-option.patch
@@ -1,7 +1,7 @@
From c50ad182f8375eacb315b894229eec7f4cad1b30 Mon Sep 17 00:00:00 2001
From: Hugues KAMBA MPIANA <hugues.kambampiana@arm.com>
Date: Fri, 18 Oct 2024 11:50:32 +0000
-Subject: [PATCH 6/7] smm-gateway/config: Remove `Werror` compile option
+Subject: [PATCH] smm-gateway/config: Remove `Werror` compile option
Adding `-Werror` to CMakeLists.txt unintended when
originally committed.
similarity index 99%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0007-fwu-proxy-refactor-image-mapping.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0009-fwu-proxy-refactor-image-mapping.patch
@@ -1,7 +1,7 @@
From ca3870a123f3449407d460dcbc6bc0ba0d135e1e Mon Sep 17 00:00:00 2001
From: Gyorgy Szing <gyorgy.szing@arm.com>
Date: Tue, 26 Aug 2025 15:01:44 +0200
-Subject: [PATCH 7/7] fwu-proxy: refactor image mapping
+Subject: [PATCH] fwu-proxy: refactor image mapping
Stop defining the size of the image mapping and the number of mappings
at different places (C code vs cmake). Move the number of images to the
similarity index 100%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0007-Revert-Load-and-store-UEFI-variable-index-in-chunks.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0010-Revert-Load-and-store-UEFI-variable-index-in-chunks.patch
similarity index 100%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0004-Remove-PLATFORM_HAS_ATTEST_PK-define-from-IAT-test.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0011-Remove-PLATFORM_HAS_ATTEST_PK-define-from-IAT-test.patch
similarity index 97%
rename from meta-arm-bsp/recipes-security/trusted-services/corstone1000/0024-psa-crypto-fix-AEAD-block-cypher-support.patch
rename to meta-arm-bsp/recipes-security/trusted-services/corstone1000/0012-psa-crypto-fix-AEAD-block-cypher-support.patch
@@ -1,7 +1,7 @@
From 85c8535f448466cdbd773f7072a42203ebc6ae64 Mon Sep 17 00:00:00 2001
From: Gabor Abonyi <gabor.abonyi@arm.com>
Date: Fri, 4 Apr 2025 11:43:09 +0000
-Subject: [PATCH 01/25] psa-crypto: fix AEAD block cypher support
+Subject: [PATCH] psa-crypto: fix AEAD block cypher support
This change enables support for block cyphers that require input data
to be processed in whole block-sized chunks.
@@ -2,18 +2,18 @@ FILESEXTRAPATHS:prepend:corstone1000 := "${THISDIR}/corstone1000:"
COMPATIBLE_MACHINE:corstone1000 = "corstone1000"
SRC_URI:append:corstone1000 = " \
- file://0009-platform-corstone1000-Add-CORSTONE_1000_TYPE-variabl.patch \
- file://0016-platform-corstone1000-Add-event-provider-proxy.patch \
- file://0017-platform-corstone1000-Define-GUID-for-each-payloads.patch \
- file://0013-Fix-PSA-FWU-IPC-psa_fwu_install-return-value-check.patch \
- file://0018-Add-the-com-buffer-address-and-page-count.patch \
- file://0014-fwu-Add-EFI-ESRT-v1-support.patch \
- file://0022-Make-treating-warnings-as-errors-configurable.patch \
- file://0003-Remove-Werror-flag.patch \
- file://0007-fwu-proxy-refactor-image-mapping.patch \
- file://0007-Revert-Load-and-store-UEFI-variable-index-in-chunks.patch \
- file://0004-Remove-PLATFORM_HAS_ATTEST_PK-define-from-IAT-test.patch \
- file://0024-psa-crypto-fix-AEAD-block-cypher-support.patch \
+ file://0001-platform-corstone1000-Add-CORSTONE_1000_TYPE-variabl.patch \
+ file://0002-platform-corstone1000-Add-event-provider-proxy-for-b.patch \
+ file://0003-fwu-se-proxy-Allow-platform-override-of-FWU-mapping-.patch \
+ file://0004-fwu-Coerce-PSA_SUCCESS_REBOOT-and-PSA_SUCCESS_RESTAR.patch \
+ file://0005-platform-corstone1000-Add-MM-communication-buffer-co.patch \
+ file://0006-fwu-Add-support-for-ESRT-v1-in-PSA-FWU-M-agent.patch \
+ file://0007-Make-treating-warnings-as-errors-configurable.patch \
+ file://0008-smm-gateway-config-Remove-Werror-compile-option.patch \
+ file://0009-fwu-proxy-refactor-image-mapping.patch \
+ file://0010-Revert-Load-and-store-UEFI-variable-index-in-chunks.patch \
+ file://0011-Remove-PLATFORM_HAS_ATTEST_PK-define-from-IAT-test.patch \
+ file://0012-psa-crypto-fix-AEAD-block-cypher-support.patch \
"
# The patches above introduce errors with GCC 14.1, silence them for now
CFLAGS:append:corstone1000 = " -Wno-int-conversion -Wno-implicit-function-declaration"
Rename the Corstone-1000 Trusted Services patches so that their numbering matches the application order, and the remainder of each patch name matches its corresponding commit message subject. Signed-off-by: Hugues KAMBA MPIANA <hugues.kambampiana@arm.com> --- ...1000-Add-CORSTONE_1000_TYPE-variabl.patch} | 2 +- ...1000-Add-event-provider-proxy-for-b.patch} | 2 +- ...w-platform-override-of-FWU-mapping-.patch} | 2 +- ...CCESS_REBOOT-and-PSA_SUCCESS_RESTAR.patch} | 2 +- ...1000-Add-MM-communication-buffer-co.patch} | 0 ...port-for-ESRT-v1-in-PSA-FWU-M-agent.patch} | 2 +- ...ing-warnings-as-errors-configurable.patch} | 2 +- ...config-Remove-Werror-compile-option.patch} | 2 +- ...09-fwu-proxy-refactor-image-mapping.patch} | 2 +- ...store-UEFI-variable-index-in-chunks.patch} | 0 ..._HAS_ATTEST_PK-define-from-IAT-test.patch} | 0 ...rypto-fix-AEAD-block-cypher-support.patch} | 2 +- .../trusted-services/ts-arm-platforms.inc | 24 +++++++++---------- 13 files changed, 21 insertions(+), 21 deletions(-) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0009-platform-corstone1000-Add-CORSTONE_1000_TYPE-variabl.patch => 0001-platform-corstone1000-Add-CORSTONE_1000_TYPE-variabl.patch} (97%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0016-platform-corstone1000-Add-event-provider-proxy.patch => 0002-platform-corstone1000-Add-event-provider-proxy-for-b.patch} (99%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0017-platform-corstone1000-Define-GUID-for-each-payloads.patch => 0003-fwu-se-proxy-Allow-platform-override-of-FWU-mapping-.patch} (99%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0013-Fix-PSA-FWU-IPC-psa_fwu_install-return-value-check.patch => 0004-fwu-Coerce-PSA_SUCCESS_REBOOT-and-PSA_SUCCESS_RESTAR.patch} (97%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0018-Add-the-com-buffer-address-and-page-count.patch => 0005-platform-corstone1000-Add-MM-communication-buffer-co.patch} (100%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0014-fwu-Add-EFI-ESRT-v1-support.patch => 0006-fwu-Add-support-for-ESRT-v1-in-PSA-FWU-M-agent.patch} (99%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0022-Make-treating-warnings-as-errors-configurable.patch => 0007-Make-treating-warnings-as-errors-configurable.patch} (99%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0003-Remove-Werror-flag.patch => 0008-smm-gateway-config-Remove-Werror-compile-option.patch} (95%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0007-fwu-proxy-refactor-image-mapping.patch => 0009-fwu-proxy-refactor-image-mapping.patch} (99%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0007-Revert-Load-and-store-UEFI-variable-index-in-chunks.patch => 0010-Revert-Load-and-store-UEFI-variable-index-in-chunks.patch} (100%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0004-Remove-PLATFORM_HAS_ATTEST_PK-define-from-IAT-test.patch => 0011-Remove-PLATFORM_HAS_ATTEST_PK-define-from-IAT-test.patch} (100%) rename meta-arm-bsp/recipes-security/trusted-services/corstone1000/{0024-psa-crypto-fix-AEAD-block-cypher-support.patch => 0012-psa-crypto-fix-AEAD-block-cypher-support.patch} (97%)