From patchwork Thu Sep 17 11:20:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harsimran Singh Tungal X-Patchwork-Id: 98538 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12D5BC982CF for ; Thu, 17 Sep 2026 11:20:57 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.36694.1789644055028652480 for ; Thu, 17 Sep 2026 04:20:55 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=A5a8eJBc; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: harsimransingh.tungal@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0A0A51FC4; Thu, 17 Sep 2026 04:20:51 -0700 (PDT) Received: from e142474.cambridge.arm.com (e142474.arm.com [10.2.203.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 99E873F7B4; Thu, 17 Sep 2026 04:20:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1789644054; bh=VgZKQlaWEkomGyBN2Kb9UeXTHoa7ISIEP5kNOkszVKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A5a8eJBcWIqW6p7Nya7dGPjFbCHBku4b/u5TdZ7ZIgFqvGdypCf1rCjJgdhCSLaZX LFYY1VQRcgR+o1pdXHh7UN2a3BokXDDcvF7XEu2nOgntKVHEUlL8q0hNds+f6i3uFR 3kKFNsGtHDLJ+ilrIP+U0LluiSjQaFxeIjtExxlc= From: Harsimran Singh Tungal To: meta-arm@lists.yoctoproject.org Cc: Harsimran Singh Tungal , Alex Chapman Subject: [PATCH 1/2] arm-bsp/u-boot: corstone1000: Upgrade to v2026.07 Date: Thu, 17 Sep 2026 12:20:31 +0100 Message-ID: <20260917112040.3877076-2-harsimransingh.tungal@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260917112040.3877076-1-harsimransingh.tungal@arm.com> References: <20260917112040.3877076-1-harsimransingh.tungal@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 17 Sep 2026 11:20:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7168 - Bump CS1K and CS1K-A320 to U-Boot v2026.07. - Refactor patches 0001->0006, 0008, 0010, 0012->0017, 0020->0022, 0024->0030, 0034, 0037, 0039->0042, 0045->0050. - Remove patch 0053 and renumber patch 0054 as 0053. - Use the upstream recipe and update the documentation. Wrynose provides v2026.07, replacing the custom v2025.10 recipe. Signed-off-by: Alex Chapman Signed-off-by: Harsimran Singh Tungal --- .../conf/machine/include/corstone1000.inc | 2 +- .../corstone1000-a320/topics/user-guide.md | 2 +- .../documentation/corstone1000/user-guide.rst | 2 +- .../u-boot/u-boot-corstone1000.inc | 3 +- ...-pointer-check-to-the-uclass-driver-.patch | 10 ++-- ...02-arm_ffa-Add-FFA_MEM_SHARE-support.patch | 14 ++--- ...-arm_ffa-Add-FFA_MEM_RECLAIM-support.patch | 14 ++--- ...Replace-the-emulator-error-log-with-.patch | 6 +-- ...Improve-the-readability-of-clearing-.patch | 20 +++---- ...-sandbox-Add-FFA_MEM_SHARE-emulation.patch | 12 ++--- ...andbox-Add-FFA_MEM_RECLAIM-emulation.patch | 12 ++--- ..._arm_psa-Initialize-the-update-agent.patch | 14 ++--- .../0012-fwu_arm_psa-Add-staging-ABIs.patch | 22 ++++---- ...rm_psa-Add-set_image-and-get_image_i.patch | 10 ++-- ..._arm_psa-Keep-the-FMP-payload-header.patch | 4 +- ...rm_psa-Skip-accepting-the-payload-af.patch | 6 +-- ...wu_arm_psa-Disable-trial-state-handl.patch | 14 ++--- ...arm_psa-Add-FWU-acceptance-mechanism.patch | 6 +-- ...ule-Add-runtime-capsule-flags-checks.patch | 6 +-- ..._psa-corstone1000-Enable-FWU-support.patch | 6 +-- ...tone1000-Perform-bank-logic-when-rea.patch | 4 +- ...tone1000-Set-Boot0001-for-on-disk-FW.patch | 4 +- ...00-set-CONFIG_FFA_SHARED_MM_BUF_ADDR.patch | 4 +- ...0026-corstone1000-Enable-MMC-for-FVP.patch | 10 ++-- ...stone1000-Enable-secure-boot-configs.patch | 4 +- ...stone1000-Enable-EFI-set_time-config.patch | 4 +- ...e1000-Enable-set-print-EFI-variables.patch | 6 +-- ...rstone1000-Enable-virtio-net-support.patch | 6 +-- ...-to-remove-non-compliant-nodes-and-p.patch | 6 +-- ...able-OF_UPSTREAM-device-tree-support.patch | 10 ++-- ...-a320-Add-Corstone1000-board-variant.patch | 15 +++--- ...rstone1000-disable-EFI-debug-support.patch | 4 +- ...efi_loader-add-runtime-memset-helper.patch | 18 +++---- ...arm-ffa-add-FF-A-bus-runtime-support.patch | 54 +++++++++---------- ...runtime-GetVariable-helpers-to-efi_v.patch | 12 ++--- ...corstone1000-enable-bootefi-selftest.patch | 10 ++-- ...-runtime-variable-tests-with-non-vol.patch | 36 ++++++------- ...sandbox-FF-A-runtime-transport-tests.patch | 8 +-- ...e-synthetic-partition-metadata-via-m.patch | 9 ++-- ...nt-FF-A-runtime-path-for-EFI-variabl.patch | 7 ++- ...ne1000-a320-enable-bootefi-selftest.patch} | 8 +-- ...der-fix-AllocatePages-overlap-status.patch | 50 ----------------- 42 files changed, 211 insertions(+), 263 deletions(-) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0054-corstone1000-a320-enable-bootefi-selftest.patch => 0053-corstone1000-a320-enable-bootefi-selftest.patch} (85%) delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0053-efi_loader-fix-AllocatePages-overlap-status.patch diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 70fa7ce1..754e9798 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -27,7 +27,7 @@ TS_SP_SE_PROXY_CONFIG = "corstone1000" MACHINE_FEATURES += "ts-smm-gateway ts-se-proxy" # U-Boot -PREFERRED_VERSION_u-boot ?= "2025.10" +PREFERRED_VERSION_u-boot ?= "2026.07" MACHINE_FEATURES += "efi" EFI_PROVIDER ?= "grub-efi" diff --git a/meta-arm-bsp/documentation/corstone1000-a320/topics/user-guide.md b/meta-arm-bsp/documentation/corstone1000-a320/topics/user-guide.md index 5bee6b58..e32ac9ff 100644 --- a/meta-arm-bsp/documentation/corstone1000-a320/topics/user-guide.md +++ b/meta-arm-bsp/documentation/corstone1000-a320/topics/user-guide.md @@ -103,7 +103,7 @@ Table: U-Boot components | --------- | ---------------------------------------------------------------------------------------------------------------- | | bbappend | `${WORKSPACE}/meta-arm/meta-arm/recipes-bsp/u-boot/u-boot_%.bbappend` | | bbappend | `${WORKSPACE}/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend` | -| Recipe | `${WORKSPACE}/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2025.10.bb` | +| Recipe | `${WORKSPACE}/core/meta/recipes-bsp/u-boot/u-boot_2026.07.bb` | #### Linux {.reference} diff --git a/meta-arm-bsp/documentation/corstone1000/user-guide.rst b/meta-arm-bsp/documentation/corstone1000/user-guide.rst index fcb9bc05..4fc547b2 100644 --- a/meta-arm-bsp/documentation/corstone1000/user-guide.rst +++ b/meta-arm-bsp/documentation/corstone1000/user-guide.rst @@ -145,7 +145,7 @@ Host Processor Components +----------+----------------------------------------------------------------------------------+ | bbappend | ``${WORKSPACE}/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend`` | +----------+----------------------------------------------------------------------------------+ -| Recipe | ``${WORKSPACE}/meta-arm/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2025.10.bb`` | +| Recipe | ``${WORKSPACE}/core/meta/recipes-bsp/u-boot/u-boot_2026.07.bb`` | +----------+----------------------------------------------------------------------------------+ Linux diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc index fe5ffafc..f9251c96 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-corstone1000.inc @@ -100,8 +100,7 @@ SRC_URI:append = " \ file://0050-doc-arm64-document-FF-A-runtime-path-for-EFI-variabl.patch \ file://0051-doc-bootefi-note-two-phase-runtime-variables-selftes.patch \ file://0052-efi_loader-align-FF-A-cache-maintenance-with-runtime.patch \ - file://0053-efi_loader-fix-AllocatePages-overlap-status.patch \ - file://0054-corstone1000-a320-enable-bootefi-selftest.patch \ + file://0053-corstone1000-a320-enable-bootefi-selftest.patch \ " uboot_configure_config:append() { diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-arm_ffa-Add-NULL-pointer-check-to-the-uclass-driver-.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-arm_ffa-Add-NULL-pointer-check-to-the-uclass-driver-.patch index a1be1806..3582452f 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-arm_ffa-Add-NULL-pointer-check-to-the-uclass-driver-.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-arm_ffa-Add-NULL-pointer-check-to-the-uclass-driver-.patch @@ -1,4 +1,4 @@ -From 891cef3c87081d0b719213c98cb2a50ecb601332 Mon Sep 17 00:00:00 2001 +From 8113805be420994a67bde766f0100fc3c39e985e Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Wed, 30 Oct 2024 14:10:43 +0000 Subject: [PATCH] arm_ffa: Add NULL pointer check to the uclass driver @@ -18,7 +18,7 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm-ffa/arm-ffa-uclass.c b/drivers/firmware/arm-ffa/arm-ffa-uclass.c -index 96c64964bb7..f8d231204db 100644 +index 76a8775e911..2f5fc879ff4 100644 --- a/drivers/firmware/arm-ffa/arm-ffa-uclass.c +++ b/drivers/firmware/arm-ffa/arm-ffa-uclass.c @@ -1,6 +1,6 @@ @@ -29,7 +29,7 @@ index 96c64964bb7..f8d231204db 100644 * * Authors: * Abdellatif El Khlifi -@@ -954,6 +954,9 @@ int ffa_partition_info_get(struct udevice *dev, const char *uuid_str, +@@ -951,6 +951,9 @@ int ffa_partition_info_get(struct udevice *dev, const char *uuid_str, { struct ffa_bus_ops *ops = ffa_get_ops(dev); @@ -39,7 +39,7 @@ index 96c64964bb7..f8d231204db 100644 if (!ops->partition_info_get) return -ENOSYS; -@@ -979,6 +982,9 @@ int ffa_sync_send_receive(struct udevice *dev, u16 dst_part_id, +@@ -976,6 +979,9 @@ int ffa_sync_send_receive(struct udevice *dev, u16 dst_part_id, { struct ffa_bus_ops *ops = ffa_get_ops(dev); @@ -49,7 +49,7 @@ index 96c64964bb7..f8d231204db 100644 if (!ops->sync_send_receive) return -ENOSYS; -@@ -1000,6 +1006,9 @@ int ffa_rxtx_unmap(struct udevice *dev) +@@ -997,6 +1003,9 @@ int ffa_rxtx_unmap(struct udevice *dev) { struct ffa_bus_ops *ops = ffa_get_ops(dev); diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-arm_ffa-Add-FFA_MEM_SHARE-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-arm_ffa-Add-FFA_MEM_SHARE-support.patch index 94c738e5..b947a41e 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-arm_ffa-Add-FFA_MEM_SHARE-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-arm_ffa-Add-FFA_MEM_SHARE-support.patch @@ -1,4 +1,4 @@ -From d4dc79029ab883a5baa33fbecd5db20a93716172 Mon Sep 17 00:00:00 2001 +From 05e6d6b8949eb00a1a22f75a53e005a8d9e3c87e Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Tue, 29 Oct 2024 17:22:35 +0000 Subject: [PATCH] arm_ffa: Add FFA_MEM_SHARE support @@ -48,10 +48,10 @@ index f966f8ba6af..3eec735d741 100644 - FF-A bus discovery makes sure FF-A framework is responsive and compatible with the driver diff --git a/drivers/firmware/arm-ffa/arm-ffa-uclass.c b/drivers/firmware/arm-ffa/arm-ffa-uclass.c -index f8d231204db..2ba0b925fa6 100644 +index 2f5fc879ff4..d09e31177d7 100644 --- a/drivers/firmware/arm-ffa/arm-ffa-uclass.c +++ b/drivers/firmware/arm-ffa/arm-ffa-uclass.c -@@ -95,6 +95,20 @@ static struct ffa_abi_errmap err_msg_map[FFA_ERRMAP_COUNT] = { +@@ -92,6 +92,20 @@ static struct ffa_abi_errmap err_msg_map[FFA_ERRMAP_COUNT] = { "DENIED: Buffer pair already registered", }, }, @@ -72,7 +72,7 @@ index f8d231204db..2ba0b925fa6 100644 }; /** -@@ -929,6 +943,177 @@ int ffa_msg_send_direct_req_hdlr(struct udevice *dev, u16 dst_part_id, +@@ -926,6 +940,177 @@ int ffa_msg_send_direct_req_hdlr(struct udevice *dev, u16 dst_part_id, return ffa_to_std_errno(ffa_errno); } @@ -250,7 +250,7 @@ index f8d231204db..2ba0b925fa6 100644 /* FF-A driver operations (used by clients for communicating with FF-A)*/ /** -@@ -1015,6 +1200,31 @@ int ffa_rxtx_unmap(struct udevice *dev) +@@ -1012,6 +1197,31 @@ int ffa_rxtx_unmap(struct udevice *dev) return ops->rxtx_unmap(dev); } @@ -283,7 +283,7 @@ index f8d231204db..2ba0b925fa6 100644 * ffa_do_probe() - probing FF-A framework * @dev: the FF-A bus device (arm_ffa) diff --git a/drivers/firmware/arm-ffa/arm-ffa.c b/drivers/firmware/arm-ffa/arm-ffa.c -index 94e6105cb38..df904cae412 100644 +index 9e6b5dcc542..8f7c5794f95 100644 --- a/drivers/firmware/arm-ffa/arm-ffa.c +++ b/drivers/firmware/arm-ffa/arm-ffa.c @@ -1,6 +1,6 @@ @@ -294,7 +294,7 @@ index 94e6105cb38..df904cae412 100644 * * Authors: * Abdellatif El Khlifi -@@ -84,6 +84,7 @@ static const struct ffa_bus_ops ffa_ops = { +@@ -81,6 +81,7 @@ static const struct ffa_bus_ops ffa_ops = { .partition_info_get = ffa_get_partitions_info_hdlr, .sync_send_receive = ffa_msg_send_direct_req_hdlr, .rxtx_unmap = ffa_unmap_rxtx_buffers_hdlr, diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-arm_ffa-Add-FFA_MEM_RECLAIM-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-arm_ffa-Add-FFA_MEM_RECLAIM-support.patch index 0cd14182..3730102e 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-arm_ffa-Add-FFA_MEM_RECLAIM-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-arm_ffa-Add-FFA_MEM_RECLAIM-support.patch @@ -1,4 +1,4 @@ -From 4a608633474b545eac07c3e4dd27bdad7bdfb005 Mon Sep 17 00:00:00 2001 +From c26404d7403748b60e61205b68b08912c34f436d Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Tue, 29 Oct 2024 17:24:43 +0000 Subject: [PATCH] arm_ffa: Add FFA_MEM_RECLAIM support @@ -47,10 +47,10 @@ index 3eec735d741..d2c4fb49f79 100644 - FF-A bus discovery makes sure FF-A framework is responsive and compatible with the driver diff --git a/drivers/firmware/arm-ffa/arm-ffa-uclass.c b/drivers/firmware/arm-ffa/arm-ffa-uclass.c -index 2ba0b925fa6..597b4e994b4 100644 +index d09e31177d7..84023f6a94c 100644 --- a/drivers/firmware/arm-ffa/arm-ffa-uclass.c +++ b/drivers/firmware/arm-ffa/arm-ffa-uclass.c -@@ -109,6 +109,18 @@ static struct ffa_abi_errmap err_msg_map[FFA_ERRMAP_COUNT] = { +@@ -106,6 +106,18 @@ static struct ffa_abi_errmap err_msg_map[FFA_ERRMAP_COUNT] = { "DENIED: Memory region ownership, permission, access or attributes error", }, }, @@ -69,7 +69,7 @@ index 2ba0b925fa6..597b4e994b4 100644 }; /** -@@ -1114,6 +1126,44 @@ int ffa_memory_share_hdlr(struct udevice *dev, struct ffa_mem_ops_args *args) +@@ -1111,6 +1123,44 @@ int ffa_memory_share_hdlr(struct udevice *dev, struct ffa_mem_ops_args *args) return ffa_memory_ops(dev, FFA_MEM_SHARE, args); } @@ -114,7 +114,7 @@ index 2ba0b925fa6..597b4e994b4 100644 /* FF-A driver operations (used by clients for communicating with FF-A)*/ /** -@@ -1225,6 +1275,32 @@ int ffa_memory_share(struct udevice *dev, struct ffa_mem_ops_args *args) +@@ -1222,6 +1272,32 @@ int ffa_memory_share(struct udevice *dev, struct ffa_mem_ops_args *args) return ops->memory_share(dev, args); } @@ -148,10 +148,10 @@ index 2ba0b925fa6..597b4e994b4 100644 * ffa_do_probe() - probing FF-A framework * @dev: the FF-A bus device (arm_ffa) diff --git a/drivers/firmware/arm-ffa/arm-ffa.c b/drivers/firmware/arm-ffa/arm-ffa.c -index df904cae412..de36f5647d2 100644 +index 8f7c5794f95..863dc7e5cac 100644 --- a/drivers/firmware/arm-ffa/arm-ffa.c +++ b/drivers/firmware/arm-ffa/arm-ffa.c -@@ -85,6 +85,7 @@ static const struct ffa_bus_ops ffa_ops = { +@@ -82,6 +82,7 @@ static const struct ffa_bus_ops ffa_ops = { .sync_send_receive = ffa_msg_send_direct_req_hdlr, .rxtx_unmap = ffa_unmap_rxtx_buffers_hdlr, .memory_share = ffa_memory_share_hdlr, diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-arm_ffa-sandbox-Replace-the-emulator-error-log-with-.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-arm_ffa-sandbox-Replace-the-emulator-error-log-with-.patch index 4f6dfeba..1a250afa 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-arm_ffa-sandbox-Replace-the-emulator-error-log-with-.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-arm_ffa-sandbox-Replace-the-emulator-error-log-with-.patch @@ -1,4 +1,4 @@ -From 28ecd80dd073448b1ec200f1bf4b6c2c4659af16 Mon Sep 17 00:00:00 2001 +From 1c41fc705dc986935000ecb49a167ab823b11116 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 17 Oct 2024 22:11:22 +0100 Subject: [PATCH] arm_ffa: sandbox: Replace the emulator error log with debug @@ -17,7 +17,7 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/arm-ffa/ffa-emul-uclass.c b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -index 1521d9b66ac..d2f051f7e2a 100644 +index 6198d687354..954cada27ce 100644 --- a/drivers/firmware/arm-ffa/ffa-emul-uclass.c +++ b/drivers/firmware/arm-ffa/ffa-emul-uclass.c @@ -1,6 +1,6 @@ @@ -28,7 +28,7 @@ index 1521d9b66ac..d2f051f7e2a 100644 * * Authors: * Abdellatif El Khlifi -@@ -658,8 +658,7 @@ void sandbox_arm_ffa_smccc_smc(ffa_value_t *args, ffa_value_t *res) +@@ -655,8 +655,7 @@ void sandbox_arm_ffa_smccc_smc(ffa_value_t *args, ffa_value_t *res) args->a0); } diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-arm_ffa-sandbox-Improve-the-readability-of-clearing-.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-arm_ffa-sandbox-Improve-the-readability-of-clearing-.patch index 549af8c8..6e4be11f 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-arm_ffa-sandbox-Improve-the-readability-of-clearing-.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-arm_ffa-sandbox-Improve-the-readability-of-clearing-.patch @@ -1,4 +1,4 @@ -From 962b8b4f2baf4a84de1fc76382ef7aa240ec1534 Mon Sep 17 00:00:00 2001 +From eaa2884eef6015b530ea66317b908f035ce73124 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Tue, 11 Feb 2025 17:54:45 +0000 Subject: [PATCH] arm_ffa: sandbox: Improve the readability of clearing the X @@ -40,10 +40,10 @@ index b0881822d78..5c46547beab 100644 /* number of emulated FF-A secure partitions (SPs) */ #define SANDBOX_PARTITIONS_CNT (4) diff --git a/drivers/firmware/arm-ffa/ffa-emul-uclass.c b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -index d2f051f7e2a..dcf5bce9435 100644 +index 954cada27ce..48b6d1fec2e 100644 --- a/drivers/firmware/arm-ffa/ffa-emul-uclass.c +++ b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -@@ -83,7 +83,7 @@ static int sandbox_ffa_version(struct udevice *emul, ffa_value_t *pargs, ffa_val +@@ -80,7 +80,7 @@ static int sandbox_ffa_version(struct udevice *emul, ffa_value_t *pargs, ffa_val res->a0 = priv->fwk_version; /* x1-x7 MBZ */ @@ -52,7 +52,7 @@ index d2f051f7e2a..dcf5bce9435 100644 return 0; } -@@ -111,7 +111,7 @@ static int sandbox_ffa_id_get(struct udevice *emul, ffa_value_t *pargs, ffa_valu +@@ -108,7 +108,7 @@ static int sandbox_ffa_id_get(struct udevice *emul, ffa_value_t *pargs, ffa_valu res->a2 = priv->id; /* x3-x7 MBZ */ @@ -61,7 +61,7 @@ index d2f051f7e2a..dcf5bce9435 100644 return 0; } -@@ -136,14 +136,14 @@ static int sandbox_ffa_features(ffa_value_t *pargs, ffa_value_t *res) +@@ -133,14 +133,14 @@ static int sandbox_ffa_features(ffa_value_t *pargs, ffa_value_t *res) res->a2 = RXTX_BUFFERS_MIN_SIZE; res->a3 = 0; /* x4-x7 MBZ */ @@ -78,7 +78,7 @@ index d2f051f7e2a..dcf5bce9435 100644 log_err("FF-A interface %lx not implemented\n", pargs->a1); return ffa_to_std_errmap[NOT_SUPPORTED]; -@@ -248,7 +248,7 @@ cleanup: +@@ -245,7 +245,7 @@ cleanup: res->a1 = 0; /* x3-x7 MBZ */ @@ -87,7 +87,7 @@ index d2f051f7e2a..dcf5bce9435 100644 return ret; } -@@ -305,7 +305,7 @@ feedback: +@@ -302,7 +302,7 @@ feedback: res->a1 = 0; /* x3-x7 MBZ */ @@ -96,7 +96,7 @@ index d2f051f7e2a..dcf5bce9435 100644 return ret; } -@@ -352,7 +352,7 @@ feedback: +@@ -349,7 +349,7 @@ feedback: res->a1 = 0; /* x3-x7 MBZ */ @@ -105,7 +105,7 @@ index d2f051f7e2a..dcf5bce9435 100644 return ret; } -@@ -388,7 +388,7 @@ static int sandbox_ffa_rx_release(struct udevice *emul, ffa_value_t *pargs, ffa_ +@@ -385,7 +385,7 @@ static int sandbox_ffa_rx_release(struct udevice *emul, ffa_value_t *pargs, ffa_ res->a1 = 0; /* x3-x7 MBZ */ @@ -114,7 +114,7 @@ index d2f051f7e2a..dcf5bce9435 100644 return ret; } -@@ -448,7 +448,7 @@ static int sandbox_ffa_msg_send_direct_req(struct udevice *emul, +@@ -445,7 +445,7 @@ static int sandbox_ffa_msg_send_direct_req(struct udevice *emul, res->a2 = -INVALID_PARAMETERS; /* x3-x7 MBZ */ diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-arm_ffa-sandbox-Add-FFA_MEM_SHARE-emulation.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-arm_ffa-sandbox-Add-FFA_MEM_SHARE-emulation.patch index d214143d..47495654 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-arm_ffa-sandbox-Add-FFA_MEM_SHARE-emulation.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-arm_ffa-sandbox-Add-FFA_MEM_SHARE-emulation.patch @@ -1,4 +1,4 @@ -From b7f2e23ff923af9a37122b385c0453ea0720dbc0 Mon Sep 17 00:00:00 2001 +From 96aa36a7e004fd424afee21b07047bb988b1dd10 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Wed, 16 Oct 2024 18:41:16 +0100 Subject: [PATCH] arm_ffa: sandbox: Add FFA_MEM_SHARE emulation @@ -44,10 +44,10 @@ index 5c46547beab..fa09f9598ee 100644 * struct ffa_rxtxpair_info - structure hosting the RX/TX buffers flags * @rxbuf_owned: RX buffer ownership flag (the owner is non secure world) diff --git a/drivers/firmware/arm-ffa/ffa-emul-uclass.c b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -index dcf5bce9435..4918404fb6d 100644 +index 48b6d1fec2e..da3f1430637 100644 --- a/drivers/firmware/arm-ffa/ffa-emul-uclass.c +++ b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -@@ -563,6 +563,46 @@ static int sandbox_ffa_get_parts(struct udevice *emul, struct ffa_sandbox_data * +@@ -560,6 +560,46 @@ static int sandbox_ffa_get_parts(struct udevice *emul, struct ffa_sandbox_data * return 0; } @@ -94,7 +94,7 @@ index dcf5bce9435..4918404fb6d 100644 /** * sandbox_query_ffa_emul_state() - Inspect the FF-A ABIs * @queried_func_id: The FF-A function to be queried -@@ -653,6 +693,9 @@ void sandbox_arm_ffa_smccc_smc(ffa_value_t *args, ffa_value_t *res) +@@ -650,6 +690,9 @@ void sandbox_arm_ffa_smccc_smc(ffa_value_t *args, ffa_value_t *res) case FFA_SMC_32(FFA_RX_RELEASE): ret = sandbox_ffa_rx_release(emul, args, res); break; @@ -105,7 +105,7 @@ index dcf5bce9435..4918404fb6d 100644 log_err("Undefined FF-A interface (%lx)\n", args->a0); diff --git a/drivers/firmware/arm-ffa/sandbox_ffa.c b/drivers/firmware/arm-ffa/sandbox_ffa.c -index 44b32a829dd..8d85e660e2b 100644 +index f1e8de4bf0d..5641b283bc8 100644 --- a/drivers/firmware/arm-ffa/sandbox_ffa.c +++ b/drivers/firmware/arm-ffa/sandbox_ffa.c @@ -1,6 +1,6 @@ @@ -116,7 +116,7 @@ index 44b32a829dd..8d85e660e2b 100644 * * Authors: * Abdellatif El Khlifi -@@ -91,6 +91,7 @@ static const struct ffa_bus_ops sandbox_ffa_ops = { +@@ -88,6 +88,7 @@ static const struct ffa_bus_ops sandbox_ffa_ops = { .partition_info_get = ffa_get_partitions_info_hdlr, .sync_send_receive = ffa_msg_send_direct_req_hdlr, .rxtx_unmap = ffa_unmap_rxtx_buffers_hdlr, diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-arm_ffa-sandbox-Add-FFA_MEM_RECLAIM-emulation.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-arm_ffa-sandbox-Add-FFA_MEM_RECLAIM-emulation.patch index db036dca..05813b8e 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-arm_ffa-sandbox-Add-FFA_MEM_RECLAIM-emulation.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-arm_ffa-sandbox-Add-FFA_MEM_RECLAIM-emulation.patch @@ -1,4 +1,4 @@ -From 99008b3a0627c975f14b7f7a64bfee5d59cd93ed Mon Sep 17 00:00:00 2001 +From 4e78b3c811b3a7e8d42db48a7fbcec179875593d Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 17 Oct 2024 15:50:02 +0100 Subject: [PATCH] arm_ffa: sandbox: Add FFA_MEM_RECLAIM emulation @@ -13,10 +13,10 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 2 files changed, 43 insertions(+) diff --git a/drivers/firmware/arm-ffa/ffa-emul-uclass.c b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -index 4918404fb6d..a630392b6d1 100644 +index da3f1430637..68a112e4900 100644 --- a/drivers/firmware/arm-ffa/ffa-emul-uclass.c +++ b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -@@ -603,6 +603,45 @@ static int sandbox_ffa_memory_share(struct udevice *emul, ffa_value_t *pargs, +@@ -600,6 +600,45 @@ static int sandbox_ffa_memory_share(struct udevice *emul, ffa_value_t *pargs, return 0; } @@ -62,7 +62,7 @@ index 4918404fb6d..a630392b6d1 100644 /** * sandbox_query_ffa_emul_state() - Inspect the FF-A ABIs * @queried_func_id: The FF-A function to be queried -@@ -696,6 +735,9 @@ void sandbox_arm_ffa_smccc_smc(ffa_value_t *args, ffa_value_t *res) +@@ -693,6 +732,9 @@ void sandbox_arm_ffa_smccc_smc(ffa_value_t *args, ffa_value_t *res) case FFA_SMC_32(FFA_MEM_SHARE): ret = sandbox_ffa_memory_share(emul, args, res); break; @@ -73,10 +73,10 @@ index 4918404fb6d..a630392b6d1 100644 log_err("Undefined FF-A interface (%lx)\n", args->a0); diff --git a/drivers/firmware/arm-ffa/sandbox_ffa.c b/drivers/firmware/arm-ffa/sandbox_ffa.c -index 8d85e660e2b..54c81d12f92 100644 +index 5641b283bc8..218ba60eae3 100644 --- a/drivers/firmware/arm-ffa/sandbox_ffa.c +++ b/drivers/firmware/arm-ffa/sandbox_ffa.c -@@ -92,6 +92,7 @@ static const struct ffa_bus_ops sandbox_ffa_ops = { +@@ -89,6 +89,7 @@ static const struct ffa_bus_ops sandbox_ffa_ops = { .sync_send_receive = ffa_msg_send_direct_req_hdlr, .rxtx_unmap = ffa_unmap_rxtx_buffers_hdlr, .memory_share = ffa_memory_share_hdlr, diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-fwu_arm_psa-Initialize-the-update-agent.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-fwu_arm_psa-Initialize-the-update-agent.patch index 641adb23..f5a263bf 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-fwu_arm_psa-Initialize-the-update-agent.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-fwu_arm_psa-Initialize-the-update-agent.patch @@ -1,4 +1,4 @@ -From 61063c4da940390bea439fc0ded48b3e79b3335d Mon Sep 17 00:00:00 2001 +From b8c376d14b75fca0bb41ee99241d62ac54969825 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Wed, 23 Oct 2024 17:45:32 +0100 Subject: [PATCH] fwu_arm_psa: Initialize the update agent @@ -40,10 +40,10 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 create mode 100644 lib/fwu_updates/fwu_arm_psa.c diff --git a/MAINTAINERS b/MAINTAINERS -index 1db1070d5f8..0567ba87742 100644 +index 45e9076de67..26c3763cc18 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -1229,6 +1229,13 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git +@@ -1256,6 +1256,13 @@ T: git https://source.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git F: drivers/watchdog/sp805_wdt.c F: drivers/watchdog/sbsa_gwdt.c @@ -55,8 +55,8 @@ index 1db1070d5f8..0567ba87742 100644 +F: lib/fwu_updates/fwu_arm_psa.c + FWU Multi Bank Update - M: Sughosh Ganu - S: Maintained + M: Sughosh Ganu + M: Kory Maincent diff --git a/include/fwu_arm_psa.h b/include/fwu_arm_psa.h new file mode 100644 index 00000000000..f1d42f9ef24 @@ -122,10 +122,10 @@ index 00000000000..f1d42f9ef24 + +#endif diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig -index a722107c129..cdc96109f0a 100644 +index b38808e3463..6e49de57852 100644 --- a/lib/fwu_updates/Kconfig +++ b/lib/fwu_updates/Kconfig -@@ -46,4 +46,22 @@ config FWU_MDATA_V2 +@@ -47,4 +47,22 @@ config FWU_MDATA_V2 metadata structure. This option enables support for FWU Metadata version 2 access. diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-fwu_arm_psa-Add-staging-ABIs.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-fwu_arm_psa-Add-staging-ABIs.patch index 098b80d0..9f171857 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-fwu_arm_psa-Add-staging-ABIs.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-fwu_arm_psa-Add-staging-ABIs.patch @@ -1,4 +1,4 @@ -From c885fd3ccc82db134a67ccb138cdaac4c5fe9ebf Mon Sep 17 00:00:00 2001 +From 0f217059335a4f2b6de93b0343bf8966e3380560 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 6 Feb 2025 11:37:33 +0000 Subject: [PATCH] fwu_arm_psa: Add staging ABIs @@ -34,7 +34,7 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 5 files changed, 523 insertions(+), 2 deletions(-) diff --git a/include/efi_api.h b/include/efi_api.h -index 77a05f752e5..1d8765ab58d 100644 +index d4fdd50c49e..450bc69a847 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -25,6 +25,9 @@ @@ -48,10 +48,10 @@ index 77a05f752e5..1d8765ab58d 100644 enum efi_timer_delay { EFI_TIMER_STOP = 0, diff --git a/include/efi_loader.h b/include/efi_loader.h -index 3e70ac07055..0340847c0b4 100644 +index 3a4d502631c..8deaa56a27e 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h -@@ -394,6 +394,11 @@ extern const efi_guid_t smbios3_guid; +@@ -398,6 +398,11 @@ extern const efi_guid_t smbios3_guid; extern const efi_guid_t efi_guid_text_input_protocol; extern const efi_guid_t efi_guid_text_output_protocol; @@ -239,10 +239,10 @@ index ba294359b5e..a8f0ff93d51 100644 + #endif diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c -index f19e78ae9d1..f28fcf85f68 100644 +index 52887f7c274..28b93abfe39 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c -@@ -15,6 +15,11 @@ +@@ -16,6 +16,11 @@ #include #include #include @@ -254,7 +254,7 @@ index f19e78ae9d1..f28fcf85f68 100644 #include #include #include -@@ -40,6 +45,10 @@ const efi_guid_t fwu_guid_os_request_fw_revert = +@@ -38,6 +43,10 @@ const efi_guid_t fwu_guid_os_request_fw_revert = const efi_guid_t fwu_guid_os_request_fw_accept = FWU_OS_REQUEST_FW_ACCEPT_GUID; @@ -265,7 +265,7 @@ index f19e78ae9d1..f28fcf85f68 100644 #define FW_ACCEPT_OS (u32)0x8000 #ifdef CONFIG_EFI_CAPSULE_ON_DISK -@@ -196,6 +205,12 @@ efi_fmp_find(efi_guid_t *image_type, u8 image_index, u64 instance, +@@ -194,6 +203,12 @@ efi_fmp_find(efi_guid_t *image_type, u8 image_index, u64 instance, continue; fmp = fmp_handler->protocol_interface; @@ -278,7 +278,7 @@ index f19e78ae9d1..f28fcf85f68 100644 /* get device's image info */ info_size = 0; image_info = NULL; -@@ -586,7 +601,7 @@ static efi_status_t efi_capsule_update_firmware( +@@ -585,7 +600,7 @@ static efi_status_t efi_capsule_update_firmware( capsule_size = capsule_data->capsule_image_size - capsule_data->header_size; @@ -287,7 +287,7 @@ index f19e78ae9d1..f28fcf85f68 100644 return EFI_UNSUPPORTED; handles = NULL; -@@ -597,6 +612,10 @@ static efi_status_t efi_capsule_update_firmware( +@@ -596,6 +611,10 @@ static efi_status_t efi_capsule_update_firmware( if (ret != EFI_SUCCESS) return EFI_UNSUPPORTED; @@ -298,7 +298,7 @@ index f19e78ae9d1..f28fcf85f68 100644 /* Payload */ for (item = capsule->embedded_driver_count; item < capsule->embedded_driver_count -@@ -611,7 +630,8 @@ static efi_status_t efi_capsule_update_firmware( +@@ -610,7 +629,8 @@ static efi_status_t efi_capsule_update_firmware( image = (void *)capsule + capsule->item_offset_list[item]; diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-efi_loader-fwu_arm_psa-Add-set_image-and-get_image_i.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-efi_loader-fwu_arm_psa-Add-set_image-and-get_image_i.patch index 269c0dfc..8018308b 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-efi_loader-fwu_arm_psa-Add-set_image-and-get_image_i.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-efi_loader-fwu_arm_psa-Add-set_image-and-get_image_i.patch @@ -1,4 +1,4 @@ -From 6760e2c19467585422377dac0e8d160f0e63dc5a Mon Sep 17 00:00:00 2001 +From 60aaeb924964f7e8dfc28ed1cb6419f6ed8cc5b3 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Wed, 18 Dec 2024 15:14:24 +0000 Subject: [PATCH] efi_loader: fwu_arm_psa: Add set_image and get_image_info @@ -17,7 +17,7 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 1 file changed, 23 insertions(+) diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c -index 216df83de67..be439b4019d 100644 +index b41969c70fd..6ec2e82190c 100644 --- a/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c @@ -4,6 +4,12 @@ @@ -75,7 +75,7 @@ index 216df83de67..be439b4019d 100644 return EFI_EXIT(ret); } -@@ -734,8 +750,10 @@ efi_status_t EFIAPI efi_firmware_raw_set_image( +@@ -748,8 +764,10 @@ efi_status_t EFIAPI efi_firmware_raw_set_image( efi_status_t (*progress)(efi_uintn_t completion), u16 **abort_reason) { @@ -86,7 +86,7 @@ index 216df83de67..be439b4019d 100644 efi_status_t status; struct fmp_state state = { 0 }; char *orig_dfu_env; -@@ -751,6 +769,10 @@ efi_status_t EFIAPI efi_firmware_raw_set_image( +@@ -765,6 +783,10 @@ efi_status_t EFIAPI efi_firmware_raw_set_image( if (status != EFI_SUCCESS) return EFI_EXIT(status); @@ -97,7 +97,7 @@ index 216df83de67..be439b4019d 100644 /* * dfu_alt_num is assigned from 0 while image_index starts from 1. * dfu_alt_num is calculated by (image_index - 1) when multi bank update -@@ -793,6 +815,7 @@ efi_status_t EFIAPI efi_firmware_raw_set_image( +@@ -807,6 +829,7 @@ efi_status_t EFIAPI efi_firmware_raw_set_image( if (ret) return EFI_EXIT(EFI_DEVICE_ERROR); diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-efi_loader-fwu_arm_psa-Keep-the-FMP-payload-header.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-efi_loader-fwu_arm_psa-Keep-the-FMP-payload-header.patch index 9dc21f5e..89136d53 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-efi_loader-fwu_arm_psa-Keep-the-FMP-payload-header.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-efi_loader-fwu_arm_psa-Keep-the-FMP-payload-header.patch @@ -1,4 +1,4 @@ -From e7858d255652e866f40b455164b172a6a8b92ccf Mon Sep 17 00:00:00 2001 +From 3b671ffcf36abdd02f7537258de2832601ee6f1a Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Fri, 24 Jan 2025 15:13:39 +0000 Subject: [PATCH] efi_loader: fwu_arm_psa: Keep the FMP payload header @@ -15,7 +15,7 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 1 file changed, 2 insertions(+) diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c -index be439b4019d..80f8acd1774 100644 +index 6ec2e82190c..d70b7e581f8 100644 --- a/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c @@ -521,8 +521,10 @@ static void efi_firmware_get_fw_version(const void **p_image, diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_loader-fwu_arm_psa-Skip-accepting-the-payload-af.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_loader-fwu_arm_psa-Skip-accepting-the-payload-af.patch index 19dcf6f1..3bb1674e 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_loader-fwu_arm_psa-Skip-accepting-the-payload-af.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_loader-fwu_arm_psa-Skip-accepting-the-payload-af.patch @@ -1,4 +1,4 @@ -From 092003a8a911e585f8b69d895a50a4f7eb4caea1 Mon Sep 17 00:00:00 2001 +From 0f1b5a2399586033ac8bba28ef1a78d5a6de9be7 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Fri, 24 Jan 2025 15:26:57 +0000 Subject: [PATCH] efi_loader: fwu_arm_psa: Skip accepting the payload after @@ -16,7 +16,7 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c -index f28fcf85f68..a28b7e978e2 100644 +index 28b93abfe39..efb8f67de9e 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -4,6 +4,11 @@ @@ -31,7 +31,7 @@ index f28fcf85f68..a28b7e978e2 100644 */ #define LOG_CATEGORY LOGC_EFI -@@ -683,7 +688,8 @@ static efi_status_t efi_capsule_update_firmware( +@@ -682,7 +687,8 @@ static efi_status_t efi_capsule_update_firmware( goto out; } diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_loader-fwu-fwu_arm_psa-Disable-trial-state-handl.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_loader-fwu-fwu_arm_psa-Disable-trial-state-handl.patch index ee7843d4..50ec3d51 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_loader-fwu-fwu_arm_psa-Disable-trial-state-handl.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_loader-fwu-fwu_arm_psa-Disable-trial-state-handl.patch @@ -1,4 +1,4 @@ -From a1f2383f8aef24e87e8a2440882fd9ff71b70fb7 Mon Sep 17 00:00:00 2001 +From b1918b792a21833d24217f5b3905e9a98d420d45 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 20 Mar 2025 15:05:08 +0000 Subject: [PATCH] efi_loader: fwu: fwu_arm_psa: Disable trial state handling @@ -15,10 +15,10 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c -index a28b7e978e2..d293d4c402b 100644 +index efb8f67de9e..e47841606dc 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c -@@ -568,7 +568,9 @@ static efi_status_t efi_capsule_update_firmware( +@@ -567,7 +567,9 @@ static efi_status_t efi_capsule_update_firmware( if (IS_ENABLED(CONFIG_FWU_MULTI_BANK_UPDATE)) { if (fwu_empty_capsule(capsule_data)) { if (fwu_empty_capsule_checks_pass()) { @@ -29,7 +29,7 @@ index a28b7e978e2..d293d4c402b 100644 } else { log_err("FWU empty capsule checks failed. Cannot start update\n"); return EFI_INVALID_PARAMETER; -@@ -1381,7 +1383,8 @@ efi_status_t efi_launch_capsules(void) +@@ -1385,7 +1387,8 @@ efi_status_t efi_launch_capsules(void) efi_capsule_scan_done(); @@ -40,10 +40,10 @@ index a28b7e978e2..d293d4c402b 100644 ret = fwu_post_update_process(fw_accept_os); } else if (capsule_update == true && update_status == false) { diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c -index 7f085a0211f..9e6511b4da0 100644 +index 2b11e5da061..dc809b9c2f9 100644 --- a/lib/fwu_updates/fwu.c +++ b/lib/fwu_updates/fwu.c -@@ -340,6 +340,11 @@ int fwu_get_mdata(struct fwu_mdata *mdata) +@@ -373,6 +373,11 @@ int fwu_get_mdata(struct fwu_mdata *mdata) if (parts_ok[i]) continue; @@ -55,7 +55,7 @@ index 7f085a0211f..9e6511b4da0 100644 memcpy(parts_mdata[i], parts_mdata[1 - i], mdata_size); err = fwu_sync_mdata(parts_mdata[i], i ? SECONDARY_PART : PRIMARY_PART); if (err) { -@@ -765,7 +770,8 @@ static int fwu_boottime_checks(void) +@@ -815,7 +820,8 @@ static int fwu_boottime_checks(void) in_trial = in_trial_state(); diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-fwu_arm_psa-Add-FWU-acceptance-mechanism.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-fwu_arm_psa-Add-FWU-acceptance-mechanism.patch index 84a1a863..9fe502d8 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-fwu_arm_psa-Add-FWU-acceptance-mechanism.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-fwu_arm_psa-Add-FWU-acceptance-mechanism.patch @@ -1,4 +1,4 @@ -From 9fc2f635885f9e250ad06e6aebfac24e75ec35fd Mon Sep 17 00:00:00 2001 +From e65b7601ea272ce60b060eb9c3b7da99c1e92056 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 20 Mar 2025 15:09:27 +0000 Subject: [PATCH] fwu_arm_psa: Add FWU acceptance mechanism @@ -65,10 +65,10 @@ index a8f0ff93d51..451d8b614e3 100644 * FWU directory information structures */ diff --git a/lib/fwu_updates/Kconfig b/lib/fwu_updates/Kconfig -index cdc96109f0a..958e54dec37 100644 +index 6e49de57852..411a04c7c56 100644 --- a/lib/fwu_updates/Kconfig +++ b/lib/fwu_updates/Kconfig -@@ -57,6 +57,14 @@ config FWU_ARM_PSA +@@ -58,6 +58,14 @@ config FWU_ARM_PSA driver that supports the Arm PSA firmware update specification as mentioned in https://developer.arm.com/documentation/den0118/a/ diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-efi_loader-capsule-Add-runtime-capsule-flags-checks.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-efi_loader-capsule-Add-runtime-capsule-flags-checks.patch index c5d781f5..0efac999 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-efi_loader-capsule-Add-runtime-capsule-flags-checks.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-efi_loader-capsule-Add-runtime-capsule-flags-checks.patch @@ -1,4 +1,4 @@ -From 7e8674fc7b2d85e62efdc7aa3937fe510ee24ddb Mon Sep 17 00:00:00 2001 +From e10f68307e8dfc7010e03b9dc74d56b300059063 Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Fri, 21 Mar 2025 15:34:44 +0000 Subject: [PATCH] efi_loader: capsule: Add runtime capsule flags checks @@ -22,10 +22,10 @@ Upstream-Status: Submitted [cover letter: https://lore.kernel.org/all/2025070215 1 file changed, 30 insertions(+) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c -index d293d4c402b..1500cd6a3f9 100644 +index e47841606dc..ded314c7d87 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c -@@ -773,6 +773,36 @@ efi_status_t EFIAPI efi_update_capsule( +@@ -772,6 +772,36 @@ efi_status_t EFIAPI efi_update_capsule( continue; } diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-fwu_arm_psa-corstone1000-Enable-FWU-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-fwu_arm_psa-corstone1000-Enable-FWU-support.patch index 6fbd5292..466538d5 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-fwu_arm_psa-corstone1000-Enable-FWU-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-fwu_arm_psa-corstone1000-Enable-FWU-support.patch @@ -1,4 +1,4 @@ -From f3749c018c06ebc475cc746771f8bbccbf7865b7 Mon Sep 17 00:00:00 2001 +From 868fbfd2e39acebbdfd60f42f9a1c30f5d0d8961 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 20 Mar 2025 14:41:41 +0000 Subject: [PATCH] fwu_arm_psa: corstone1000: Enable FWU support @@ -193,7 +193,7 @@ index 16d0e679c3e..d2176b9174d 100644 { gd->ram_size = PHYS_SDRAM_1_SIZE; diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index 527a679b785..a75877a9174 100644 +index 876b915b6a4..e436c50fed1 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -10,11 +10,16 @@ CONFIG_DEFAULT_DEVICE_TREE="corstone1000-mps3" @@ -230,7 +230,7 @@ index 527a679b785..a75877a9174 100644 CONFIG_CMD_RTC=y CONFIG_CMD_TIME=y CONFIG_CMD_GETTIME=y -@@ -68,4 +74,6 @@ CONFIG_USB_ISP1760=y +@@ -67,4 +73,6 @@ CONFIG_USB_ISP1760=y # CONFIG_RANDOM_UUID is not set CONFIG_ERRNO_STR=y CONFIG_FWU_MULTI_BANK_UPDATE=y diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-fwu_arm_psa-corstone1000-Perform-bank-logic-when-rea.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-fwu_arm_psa-corstone1000-Perform-bank-logic-when-rea.patch index 8a70947f..8cd8be47 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-fwu_arm_psa-corstone1000-Perform-bank-logic-when-rea.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-fwu_arm_psa-corstone1000-Perform-bank-logic-when-rea.patch @@ -1,4 +1,4 @@ -From 0aa80df8e50eba1474e37a4128e835fb56de8362 Mon Sep 17 00:00:00 2001 +From 501284b8f631a641f7464376d4483a1a1059f50c Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Wed, 5 Mar 2025 19:09:20 +0000 Subject: [PATCH] fwu_arm_psa: corstone1000: Perform bank logic when reading @@ -127,7 +127,7 @@ index d2176b9174d..2ccf851e6c5 100644 + } } diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index a75877a9174..7be842a2fe2 100644 +index e436c50fed1..b7a5a2bb4ce 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -32,7 +32,6 @@ CONFIG_LOGLEVEL=7 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-fwu_arm_psa-corstone1000-Set-Boot0001-for-on-disk-FW.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-fwu_arm_psa-corstone1000-Set-Boot0001-for-on-disk-FW.patch index ed642e05..8d9f2682 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-fwu_arm_psa-corstone1000-Set-Boot0001-for-on-disk-FW.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-fwu_arm_psa-corstone1000-Set-Boot0001-for-on-disk-FW.patch @@ -1,4 +1,4 @@ -From b1c71e1aea7bf7709bc18171e395ab6391da319a Mon Sep 17 00:00:00 2001 +From 5e9684d8e657ad35c029871090f1928b1be18f2a Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Fri, 2 May 2025 15:42:56 +0100 Subject: [PATCH] fwu_arm_psa: corstone1000: Set Boot0001 for on-disk FWU @@ -42,7 +42,7 @@ index ee318b1b1c3..6e631b12bc2 100644 + efidebug boot add -B 1 OnDiskFWU mmc 1:1 / ; + fi; diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index 7be842a2fe2..d7c5d030e9a 100644 +index b7a5a2bb4ce..8d8602bbc95 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -25,7 +25,7 @@ CONFIG_DISTRO_DEFAULTS=y diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-set-CONFIG_FFA_SHARED_MM_BUF_ADDR.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-set-CONFIG_FFA_SHARED_MM_BUF_ADDR.patch index 52f97d92..69349339 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-set-CONFIG_FFA_SHARED_MM_BUF_ADDR.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-set-CONFIG_FFA_SHARED_MM_BUF_ADDR.patch @@ -1,4 +1,4 @@ -From 33f002d751efb756f2eac188be11a53dd90e1018 Mon Sep 17 00:00:00 2001 +From 22fc93a4070651895d1d7a32f61fe6066ae53f92 Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Thu, 20 Mar 2025 15:49:26 +0000 Subject: [PATCH] corstone1000: set CONFIG_FFA_SHARED_MM_BUF_ADDR @@ -13,7 +13,7 @@ Upstream-Status: Pending [Not submitted to upstream yet] 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index d7c5d030e9a..3e0fe47bbaf 100644 +index 8d8602bbc95..896f97c654f 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -14,7 +14,7 @@ CONFIG_FWU_NUM_IMAGES_PER_BANK=4 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-corstone1000-Enable-MMC-for-FVP.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-corstone1000-Enable-MMC-for-FVP.patch index 9b871a1f..0f7b83bf 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-corstone1000-Enable-MMC-for-FVP.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-corstone1000-Enable-MMC-for-FVP.patch @@ -1,4 +1,4 @@ -From ebaa8f79cd68e2bd6fbe43bb76c70da31f69349b Mon Sep 17 00:00:00 2001 +From adda025a5bfa2095254dcac1c0304ad783850df7 Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Thu, 20 Mar 2025 15:56:14 +0000 Subject: [PATCH] corstone1000: Enable MMC for FVP @@ -43,7 +43,7 @@ index 2532c5f10fa..9189640ef75 100644 /* OCVM */ .virt = 0x80000000UL, diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index 3e0fe47bbaf..c0fecb4aea1 100644 +index 896f97c654f..0102680a91d 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -6,6 +6,7 @@ CONFIG_SYS_MALLOC_LEN=0x2000000 @@ -62,10 +62,10 @@ index 3e0fe47bbaf..c0fecb4aea1 100644 CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_CACHE=y -@@ -51,9 +53,10 @@ CONFIG_OF_CONTROL=y +@@ -50,9 +52,10 @@ CONFIG_CMD_GETTIME=y + CONFIG_OF_CONTROL=y CONFIG_VERSION_VARIABLE=y CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_REGMAP=y +CONFIG_CLK=y CONFIG_ARM_FFA_TRANSPORT=y CONFIG_MISC=y @@ -73,7 +73,7 @@ index 3e0fe47bbaf..c0fecb4aea1 100644 +CONFIG_ARM_PL180_MMCI=y CONFIG_MTD=y CONFIG_NVMXIP_QSPI=y - CONFIG_PHYLIB=y + CONFIG_SMC911X=y diff --git a/include/configs/corstone1000.h b/include/configs/corstone1000.h index 3ada21cbba1..737b7c277fb 100644 --- a/include/configs/corstone1000.h diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-Enable-secure-boot-configs.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-Enable-secure-boot-configs.patch index 3527ef30..bc9f13d0 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-Enable-secure-boot-configs.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-Enable-secure-boot-configs.patch @@ -1,4 +1,4 @@ -From 7fb2abeb111ed33c08efb04d0790bb0767f7737f Mon Sep 17 00:00:00 2001 +From 63dfe8e3dc0744024185b36e912d1de8322b6fcb Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Thu, 20 Mar 2025 16:01:56 +0000 Subject: [PATCH] corstone1000: Enable secure boot configs @@ -13,7 +13,7 @@ Upstream-Status: Pending [Not submitted to upstream yet] 1 file changed, 3 insertions(+) diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index c0fecb4aea1..c44911e6f64 100644 +index 0102680a91d..e88410f3868 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -12,6 +12,7 @@ CONFIG_SYS_BOOTM_LEN=0x800000 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-corstone1000-Enable-EFI-set_time-config.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-corstone1000-Enable-EFI-set_time-config.patch index 08bc965e..9c2ba5da 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-corstone1000-Enable-EFI-set_time-config.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-corstone1000-Enable-EFI-set_time-config.patch @@ -1,4 +1,4 @@ -From bdba4f1c13464378a74fa859d641fa1cce6a672e Mon Sep 17 00:00:00 2001 +From 125dbd335df609433b9776fe0f864cbc67acd880 Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Thu, 20 Mar 2025 16:06:18 +0000 Subject: [PATCH] corstone1000: Enable EFI set_time() config @@ -19,7 +19,7 @@ Upstream-Status: Pending [Not submitted to upstream yet] 1 file changed, 1 insertion(+) diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index c44911e6f64..cbf4550cdb1 100644 +index e88410f3868..f12d0001448 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0x82100000 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-Enable-set-print-EFI-variables.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-Enable-set-print-EFI-variables.patch index 277d8ad4..3127a98a 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-Enable-set-print-EFI-variables.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-Enable-set-print-EFI-variables.patch @@ -1,4 +1,4 @@ -From bc8a921c11526e42b601aabae93142f74af9cd41 Mon Sep 17 00:00:00 2001 +From 4258bc23a1fab11d7332e2a44a83b3d625f045ec Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Thu, 20 Mar 2025 16:08:16 +0000 Subject: [PATCH] corstone1000: Enable set/print EFI variables @@ -13,7 +13,7 @@ Upstream-Status: Pending [Not submitted to upstream yet] 1 file changed, 2 insertions(+) diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index cbf4550cdb1..00c3bb5f557 100644 +index f12d0001448..2256686d6d0 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -42,6 +42,7 @@ CONFIG_SYS_PROMPT="corstone1000# " @@ -24,7 +24,7 @@ index cbf4550cdb1..00c3bb5f557 100644 CONFIG_CMD_GPT=y CONFIG_CMD_LOADM=y # CONFIG_CMD_LOADS is not set -@@ -79,6 +80,7 @@ CONFIG_USB=y +@@ -78,6 +79,7 @@ CONFIG_USB=y CONFIG_USB_ISP1760=y # CONFIG_RANDOM_UUID is not set CONFIG_ERRNO_STR=y diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-corstone1000-Enable-virtio-net-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-corstone1000-Enable-virtio-net-support.patch index f166633c..9414b310 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-corstone1000-Enable-virtio-net-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-corstone1000-Enable-virtio-net-support.patch @@ -1,4 +1,4 @@ -From fcb9e4ae4670e13bc0023e658303fe72d4dfd4ae Mon Sep 17 00:00:00 2001 +From bd45a9f2f4c7f420aef245c10c28e91c84b62120 Mon Sep 17 00:00:00 2001 From: Frazer Carsley Date: Mon, 19 Jan 2026 15:00:29 +0000 Subject: [PATCH] corstone1000: Enable virtio-net support @@ -98,7 +98,7 @@ index 9189640ef75..39fd10ed653 100644 + return 0; +} diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index 00c3bb5f557..4ec23b4af1c 100644 +index 2256686d6d0..a4b448f7380 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -37,6 +37,7 @@ CONFIG_LOGLEVEL=7 @@ -109,7 +109,7 @@ index 00c3bb5f557..4ec23b4af1c 100644 CONFIG_SYS_PROMPT="corstone1000# " # CONFIG_CMD_CONSOLE is not set CONFIG_CMD_FWU_METADATA=y -@@ -78,6 +79,8 @@ CONFIG_TEE=y +@@ -77,6 +78,8 @@ CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_USB=y CONFIG_USB_ISP1760=y diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch index 03d07ae3..597400c4 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch @@ -1,4 +1,4 @@ -From a0207b9fa7f30ed28a791f8503800dda7130e103 Mon Sep 17 00:00:00 2001 +From 8cae6188a0691396b70fb85fa3ceb74d39a3d37c Mon Sep 17 00:00:00 2001 From: Sughosh Ganu Date: Thu, 22 May 2025 17:57:14 +0100 Subject: [PATCH] dt: Provide a way to remove non-compliant nodes and @@ -42,10 +42,10 @@ index fa1622cb1dc..f535c60471b 100644 +#define DT_NON_COMPLIANT_PURGE_LIST(__name) \ + ll_entry_declare_list(struct dt_non_compliant_purge, __name, dt_purge) diff --git a/lib/Makefile b/lib/Makefile -index 2643bfc867c..4c931aff4d2 100644 +index d0ffabc2b47..aa89536020b 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -65,6 +65,7 @@ endif +@@ -67,6 +67,7 @@ endif obj-$(CONFIG_$(PHASE_)CRC8) += crc8.o obj-$(CONFIG_$(PHASE_)CRC16) += crc16.o obj-$(CONFIG_$(PHASE_)CRC16) += crc16-ccitt.o diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-enable-OF_UPSTREAM-device-tree-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-enable-OF_UPSTREAM-device-tree-support.patch index 5da63516..731fd094 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-enable-OF_UPSTREAM-device-tree-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-enable-OF_UPSTREAM-device-tree-support.patch @@ -1,4 +1,4 @@ -From e1b46cabacd2bbbde5ac42a01af21126788f274e Mon Sep 17 00:00:00 2001 +From c413bd895bf3f9dedddf0b519476acf59682ac2a Mon Sep 17 00:00:00 2001 From: Frazer Carsley Date: Mon, 19 Jan 2026 15:16:52 +0000 Subject: [PATCH] corstone1000: enable OF_UPSTREAM device tree support @@ -35,10 +35,10 @@ Upstream-Status: Pending [Not submitted to upstream yet] delete mode 100644 arch/arm/dts/corstone1000.dtsi diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 7c8cf3a5a1d..89b3728379b 100644 +index 2b65cd9105c..aa1409b7c03 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -1206,9 +1206,6 @@ dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb +@@ -1188,9 +1188,6 @@ dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb dtb-$(CONFIG_ARCH_QEMU) += qemu-arm.dtb qemu-arm64.dtb @@ -502,7 +502,7 @@ index 1b9c3a9ed16..db8919298e1 100644 if (!virtio_bus) { log_err("Cannot find virtio device, err (%d)\n", ret); diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index 4ec23b4af1c..6ff855e7ce9 100644 +index a4b448f7380..465a72cfde6 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -7,7 +7,7 @@ CONFIG_NR_DRAM_BANKS=1 @@ -523,4 +523,4 @@ index 4ec23b4af1c..6ff855e7ce9 100644 +CONFIG_OF_UPSTREAM_VENDOR="arm" CONFIG_VERSION_VARIABLE=y CONFIG_NET_RANDOM_ETHADDR=y - CONFIG_REGMAP=y + CONFIG_CLK=y diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-a320-Add-Corstone1000-board-variant.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-a320-Add-Corstone1000-board-variant.patch index 85b73644..66b30307 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-a320-Add-Corstone1000-board-variant.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-a320-Add-Corstone1000-board-variant.patch @@ -1,4 +1,4 @@ -From 9b0a2622667bfe5794c77161d973d6f59871668c Mon Sep 17 00:00:00 2001 +From fc11a0288d1d5d431a9c3b3ddca147f73454f281 Mon Sep 17 00:00:00 2001 From: Frazer Carsley Date: Wed, 25 Feb 2026 14:28:08 +0000 Subject: [PATCH] corstone1000-a320: Add Corstone1000 board variant @@ -61,10 +61,10 @@ Signed-off-by: Michael Safwat create mode 100644 doc/device-tree-bindings/arm/arm,corstone1000-a320.yml diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 625d2e995d2..aacc39fa60c 100644 +index 514bf2000b4..17f82a0aedc 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -2405,6 +2405,7 @@ source "arch/arm/mach-npcm/Kconfig" +@@ -2416,6 +2416,7 @@ source "arch/arm/mach-npcm/Kconfig" source "board/armltd/total_compute/Kconfig" source "board/armltd/corstone1000/Kconfig" @@ -344,7 +344,7 @@ index 00000000000..6715e15ec37 +}; + diff --git a/arch/arm/include/asm/armv8/cpu.h b/arch/arm/include/asm/armv8/cpu.h -index e906fdf1bf1..1ae679f7119 100644 +index d8f0e16dadd..eea564e3020 100644 --- a/arch/arm/include/asm/armv8/cpu.h +++ b/arch/arm/include/asm/armv8/cpu.h @@ -1,6 +1,7 @@ @@ -359,15 +359,16 @@ index e906fdf1bf1..1ae679f7119 100644 #define MIDR_PARTNUM_CORTEX_A73 0xD09 #define MIDR_PARTNUM_CORTEX_A75 0xD0A #define MIDR_PARTNUM_CORTEX_A76 0xD0B -+#define MIDR_PARTNUM_CORTEX_A320 0xD8F ++#define MIDR_PARTNUM_CORTEX_A320 0xD8F + #define MIDR_PARTNUM_CORTEX_A720 0xD81 #define MIDR_PARTNUM_SHIFT 0x4 #define MIDR_PARTNUM_MASK (0xFFF << MIDR_PARTNUM_SHIFT) - -@@ -40,3 +42,4 @@ is_cortex_a(72) +@@ -41,4 +43,5 @@ is_cortex_a(72) is_cortex_a(73) is_cortex_a(75) is_cortex_a(76) +is_cortex_a(320) + is_cortex_a(720) diff --git a/board/armltd/corstone1000-a320/Kconfig b/board/armltd/corstone1000-a320/Kconfig new file mode 100644 index 00000000000..607e5f6689b diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-configs-corstone1000-disable-EFI-debug-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-configs-corstone1000-disable-EFI-debug-support.patch index efd44bfd..bdd1877f 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-configs-corstone1000-disable-EFI-debug-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-configs-corstone1000-disable-EFI-debug-support.patch @@ -1,4 +1,4 @@ -From e43e45860f3aecac1a58836c14ec9e961c284ad7 Mon Sep 17 00:00:00 2001 +From a92c4b10c6bc73e19e35134231ee9a299450e2e1 Mon Sep 17 00:00:00 2001 From: Michael Safwat Date: Thu, 23 Apr 2026 18:16:45 +0100 Subject: [PATCH] configs: corstone1000: disable EFI debug support @@ -33,7 +33,7 @@ index c7636bf45f8..290c6223bb1 100644 CONFIG_EFI_MM_COMM_TEE=y CONFIG_FFA_SHARED_MM_BUF_SIZE=4096 diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index 6ff855e7ce9..8448925e46a 100644 +index 465a72cfde6..d52b8681a6f 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig @@ -13,6 +13,7 @@ CONFIG_SYS_LOAD_ADDR=0x82100000 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0041-efi_loader-add-runtime-memset-helper.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0041-efi_loader-add-runtime-memset-helper.patch index b0da200c..b11a5e67 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0041-efi_loader-add-runtime-memset-helper.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0041-efi_loader-add-runtime-memset-helper.patch @@ -1,7 +1,7 @@ -From 7e878429dc5f186ff945281513593c54beaf03f6 Mon Sep 17 00:00:00 2001 +From ce7c0ac113e07baa9631b131ea8be0cbdc099fe5 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Fri, 10 Apr 2026 17:20:59 +0100 -Subject: [PATCH 41/53] efi_loader: add runtime memset helper +Subject: [PATCH] efi_loader: add runtime memset helper Add efi_memset_runtime() for EFI runtime paths @@ -16,12 +16,12 @@ Signed-off-by: Harsimran Singh Tungal 2 files changed, 24 insertions(+) diff --git a/include/efi_loader.h b/include/efi_loader.h -index 0340847c0b4..ec30042665b 100644 +index 8deaa56a27e..6a59397498b 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h -@@ -1149,6 +1149,9 @@ struct pkcs7_message *efi_parse_pkcs7_header(const void *buf, - /* runtime implementation of memcpy() */ - void efi_memcpy_runtime(void *dest, const void *src, size_t n); +@@ -1156,6 +1156,9 @@ void efi_memcpy_runtime(void *dest, const void *src, size_t n); + /* runtime implementation of memcmp() */ + int efi_memcmp_runtime(const void *s1, const void *s2, size_t n); +/* runtime implementation of memset */ +__efi_runtime void *efi_memset_runtime(void *dest, int c, size_t n); @@ -30,11 +30,11 @@ index 0340847c0b4..ec30042665b 100644 u16 *efi_create_indexed_name(u16 *buffer, size_t buffer_size, const char *name, unsigned int index); diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c -index 35eb6a77766..e91b1583b6e 100644 +index 73d4097464c..d9604399209 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c -@@ -209,6 +209,27 @@ void __efi_runtime efi_memcpy_runtime(void *dest, const void *src, size_t n) - *d++ = *s++; +@@ -233,6 +233,27 @@ int __efi_runtime efi_memcmp_runtime(const void *s1, const void *s2, size_t n) + return 0; } +/** diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0042-arm-ffa-add-FF-A-bus-runtime-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0042-arm-ffa-add-FF-A-bus-runtime-support.patch index 94d24a7f..7008bae0 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0042-arm-ffa-add-FF-A-bus-runtime-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0042-arm-ffa-add-FF-A-bus-runtime-support.patch @@ -1,7 +1,7 @@ -From 2f4000043db3a5658e946a66f1e2b8b8c48dffc7 Mon Sep 17 00:00:00 2001 +From 663ef530e0618172b7eaf0acb65cd8bf9ce91098 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Thu, 20 Nov 2025 21:56:22 +0000 -Subject: [PATCH 42/53] arm-ffa: add FF-A bus runtime support +Subject: [PATCH] arm-ffa: add FF-A bus runtime support Enable FF-A runtime transport for EFI services @@ -42,15 +42,15 @@ Signed-off-by: Harsimran Singh Tungal include/arm_ffa_priv.h | 24 +- include/arm_ffa_runtime.h | 189 +++++++++++++ test/dm/ffa.c | 6 +- - 10 files changed, 564 insertions(+), 120 deletions(-) + 10 files changed, 565 insertions(+), 119 deletions(-) create mode 100644 drivers/firmware/arm-ffa/arm-ffa-runtime.c create mode 100644 include/arm_ffa_runtime.h diff --git a/drivers/firmware/arm-ffa/Kconfig b/drivers/firmware/arm-ffa/Kconfig -index d75f8b53fd8..1be9adeb1db 100644 +index 3706a889305..7aaf25fdb58 100644 --- a/drivers/firmware/arm-ffa/Kconfig +++ b/drivers/firmware/arm-ffa/Kconfig -@@ -17,6 +17,9 @@ config ARM_FFA_TRANSPORT +@@ -18,6 +18,9 @@ config ARM_FFA_TRANSPORT The FF-A support in U-Boot is based on FF-A specification v1.0 and uses SMC32 calling convention. @@ -60,7 +60,7 @@ index d75f8b53fd8..1be9adeb1db 100644 FF-A specification: https://developer.arm.com/documentation/den0077/a/?lang=en -@@ -40,3 +43,11 @@ config ARM_FFA_TRANSPORT +@@ -41,3 +44,11 @@ config ARM_FFA_TRANSPORT Secure World (sandbox_ffa.c). For more details about the FF-A support, please refer to doc/arch/arm64.ffa.rst @@ -391,7 +391,7 @@ index 00000000000..82c75da7d4b + return ops_rt->sync_send_receive(dst_part_id, msg, is_smc64); +} diff --git a/drivers/firmware/arm-ffa/arm-ffa-uclass.c b/drivers/firmware/arm-ffa/arm-ffa-uclass.c -index 597b4e994b4..f769e0e9b05 100644 +index 84023f6a94c..ec344a887de 100644 --- a/drivers/firmware/arm-ffa/arm-ffa-uclass.c +++ b/drivers/firmware/arm-ffa/arm-ffa-uclass.c @@ -1,12 +1,13 @@ @@ -409,9 +409,9 @@ index 597b4e994b4..f769e0e9b05 100644 #include #include #include -@@ -21,19 +22,6 @@ - - DECLARE_GLOBAL_DATA_PTR; +@@ -18,18 +19,7 @@ + #include + #include -/* Error mapping declarations */ - @@ -425,11 +425,11 @@ index 597b4e994b4..f769e0e9b05 100644 - [RETRY] = -EAGAIN, - [ABORTED] = -ECANCELED, -}; -- ++DECLARE_GLOBAL_DATA_PTR; + static struct ffa_abi_errmap err_msg_map[FFA_ERRMAP_COUNT] = { [FFA_ID_TO_ERRMAP_ID(FFA_VERSION)] = { - { -@@ -123,27 +111,6 @@ static struct ffa_abi_errmap err_msg_map[FFA_ERRMAP_COUNT] = { +@@ -120,27 +110,6 @@ static struct ffa_abi_errmap err_msg_map[FFA_ERRMAP_COUNT] = { }, }; @@ -457,7 +457,7 @@ index 597b4e994b4..f769e0e9b05 100644 /** * ffa_print_error_log() - print the error log corresponding to the selected FF-A ABI * @ffa_id: FF-A ABI ID -@@ -233,7 +200,7 @@ int ffa_get_version_hdlr(struct udevice *dev) +@@ -230,7 +199,7 @@ int ffa_get_version_hdlr(struct udevice *dev) if (dev) { uc_priv = dev_get_uclass_priv(dev); if (uc_priv) @@ -466,7 +466,7 @@ index 597b4e994b4..f769e0e9b05 100644 } return 0; -@@ -267,8 +234,8 @@ static int ffa_get_endpoint_id(struct udevice *dev) +@@ -264,8 +233,8 @@ static int ffa_get_endpoint_id(struct udevice *dev) }, &res); if (res.a0 == FFA_SMC_32(FFA_SUCCESS)) { @@ -477,7 +477,7 @@ index 597b4e994b4..f769e0e9b05 100644 return 0; } -@@ -490,7 +457,7 @@ int ffa_unmap_rxtx_buffers_hdlr(struct udevice *dev) +@@ -487,7 +456,7 @@ int ffa_unmap_rxtx_buffers_hdlr(struct udevice *dev) invoke_ffa_fn((ffa_value_t){ .a0 = FFA_SMC_32(FFA_RXTX_UNMAP), @@ -486,7 +486,7 @@ index 597b4e994b4..f769e0e9b05 100644 }, &res); if (res.a0 == FFA_SMC_32(FFA_SUCCESS)) { -@@ -880,16 +847,8 @@ static int ffa_cache_partitions_info(struct udevice *dev) +@@ -877,16 +846,8 @@ static int ffa_cache_partitions_info(struct udevice *dev) * @msg: pointer to the message data preallocated by the client (in/out) * @is_smc64: select 64-bit or 32-bit FF-A ABI * @@ -505,7 +505,7 @@ index 597b4e994b4..f769e0e9b05 100644 * * Return: * -@@ -898,9 +857,6 @@ static int ffa_cache_partitions_info(struct udevice *dev) +@@ -895,9 +856,6 @@ static int ffa_cache_partitions_info(struct udevice *dev) int ffa_msg_send_direct_req_hdlr(struct udevice *dev, u16 dst_part_id, struct ffa_send_direct_data *msg, bool is_smc64) { @@ -515,7 +515,7 @@ index 597b4e994b4..f769e0e9b05 100644 struct ffa_priv *uc_priv; uc_priv = dev_get_uclass_priv(dev); -@@ -909,50 +865,7 @@ int ffa_msg_send_direct_req_hdlr(struct udevice *dev, u16 dst_part_id, +@@ -906,50 +864,7 @@ int ffa_msg_send_direct_req_hdlr(struct udevice *dev, u16 dst_part_id, if (!uc_priv->partitions.count || !uc_priv->partitions.descs) return -ENODEV; @@ -567,7 +567,7 @@ index 597b4e994b4..f769e0e9b05 100644 } /** -@@ -1008,7 +921,7 @@ static int ffa_setup_and_transmit(struct udevice *dev, u32 func_id, +@@ -1005,7 +920,7 @@ static int ffa_setup_and_transmit(struct udevice *dev, u32 func_id, mem_region->tag = args->tag; mem_region->flags = args->flags; @@ -576,7 +576,7 @@ index 597b4e994b4..f769e0e9b05 100644 /* * These attributes are only valid for FFA_MEM_SHARE. -@@ -1322,6 +1235,7 @@ int ffa_memory_reclaim(struct udevice *dev, u64 g_handle, u32 flags) +@@ -1319,6 +1234,7 @@ int ffa_memory_reclaim(struct udevice *dev, u64 g_handle, u32 flags) static int ffa_do_probe(struct udevice *dev) { int ret; @@ -584,7 +584,7 @@ index 597b4e994b4..f769e0e9b05 100644 ret = ffa_get_version_hdlr(dev); if (ret) -@@ -1345,6 +1259,11 @@ static int ffa_do_probe(struct udevice *dev) +@@ -1342,6 +1258,11 @@ static int ffa_do_probe(struct udevice *dev) return ret; } @@ -597,7 +597,7 @@ index 597b4e994b4..f769e0e9b05 100644 } diff --git a/drivers/firmware/arm-ffa/arm-ffa.c b/drivers/firmware/arm-ffa/arm-ffa.c -index de36f5647d2..0d451c0ddc7 100644 +index 863dc7e5cac..f96d7613669 100644 --- a/drivers/firmware/arm-ffa/arm-ffa.c +++ b/drivers/firmware/arm-ffa/arm-ffa.c @@ -1,6 +1,6 @@ @@ -615,8 +615,8 @@ index de36f5647d2..0d451c0ddc7 100644 +#include #include #include - #include -@@ -28,6 +29,19 @@ void invoke_ffa_fn(ffa_value_t args, ffa_value_t *res) + #include +@@ -25,6 +26,19 @@ void invoke_ffa_fn(ffa_value_t args, ffa_value_t *res) arm_smccc_1_2_smc(&args, res); } @@ -637,10 +637,10 @@ index de36f5647d2..0d451c0ddc7 100644 * arm_ffa_discover() - perform FF-A discovery * @dev: The Arm FF-A bus device (arm_ffa) diff --git a/drivers/firmware/arm-ffa/ffa-emul-uclass.c b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -index a630392b6d1..531ecb12f3a 100644 +index 68a112e4900..084c0540988 100644 --- a/drivers/firmware/arm-ffa/ffa-emul-uclass.c +++ b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -@@ -758,6 +758,18 @@ void invoke_ffa_fn(ffa_value_t args, ffa_value_t *res) +@@ -755,6 +755,18 @@ void invoke_ffa_fn(ffa_value_t args, ffa_value_t *res) sandbox_arm_ffa_smccc_smc(&args, res); } diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0045-efi_loader-move-runtime-GetVariable-helpers-to-efi_v.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0045-efi_loader-move-runtime-GetVariable-helpers-to-efi_v.patch index f3da408a..c767b1c8 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0045-efi_loader-move-runtime-GetVariable-helpers-to-efi_v.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0045-efi_loader-move-runtime-GetVariable-helpers-to-efi_v.patch @@ -1,7 +1,7 @@ -From 5c2b1f517c97f3349108bfd9fef9aac40ba236ac Mon Sep 17 00:00:00 2001 +From 1cfb00acce86ad31d3f1093ae5fd03b97c37bd83 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Fri, 12 Dec 2025 10:59:47 +0000 -Subject: [PATCH 45/53] efi_loader: move runtime GetVariable() helpers to +Subject: [PATCH] efi_loader: move runtime GetVariable() helpers to efi_variable.c Consolidate runtime GetVariable helpers to avoid duplicates @@ -32,10 +32,10 @@ Signed-off-by: Harsimran Singh Tungal 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/lib/efi_loader/efi_var_common.c b/lib/efi_loader/efi_var_common.c -index 4b34a58b4cf..0eaf89112e6 100644 +index e51b21fe0b0..717f83dffa7 100644 --- a/lib/efi_loader/efi_var_common.c +++ b/lib/efi_loader/efi_var_common.c -@@ -172,30 +172,6 @@ efi_status_t EFIAPI efi_query_variable_info( +@@ -173,30 +173,6 @@ efi_status_t EFIAPI efi_query_variable_info( return EFI_EXIT(ret); } @@ -67,10 +67,10 @@ index 4b34a58b4cf..0eaf89112e6 100644 * efi_set_secure_state - modify secure boot state variables * @secure_boot: value of SecureBoot diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c -index f3533f4def3..a688c6da58d 100644 +index 9923936c1b5..f2e0e1ad4e2 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c -@@ -566,6 +566,30 @@ efi_set_variable_runtime(u16 *variable_name, const efi_guid_t *vendor, +@@ -579,6 +579,30 @@ efi_set_variable_runtime(u16 *variable_name, const efi_guid_t *vendor, return EFI_SUCCESS; } diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0046-corstone1000-enable-bootefi-selftest.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0046-corstone1000-enable-bootefi-selftest.patch index c1dc141a..6a4938b1 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0046-corstone1000-enable-bootefi-selftest.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0046-corstone1000-enable-bootefi-selftest.patch @@ -1,7 +1,7 @@ -From 4c8504fe21f91bf462486afdfe4113f8bbc9f930 Mon Sep 17 00:00:00 2001 +From af41adfbb40010685175eddd53a0a3f41b18775a Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Sun, 11 Jan 2026 20:34:13 +0000 -Subject: [PATCH 46/53] corstone1000: enable bootefi selftest +Subject: [PATCH] corstone1000: enable bootefi selftest Enable UEFI selftest command in Corstone-1000 defconfig @@ -16,10 +16,10 @@ Signed-off-by: Harsimran Singh Tungal 1 file changed, 3 insertions(+) diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index 350607892fa..8de2f9bd440 100644 +index d52b8681a6f..94f440ab66c 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig -@@ -41,6 +41,8 @@ CONFIG_SYS_PROMPT="corstone1000# " +@@ -43,6 +43,8 @@ CONFIG_SYS_PROMPT="corstone1000# " # CONFIG_CMD_CONSOLE is not set CONFIG_CMD_FWU_METADATA=y CONFIG_CMD_BOOTZ=y @@ -28,7 +28,7 @@ index 350607892fa..8de2f9bd440 100644 # CONFIG_CMD_XIMG is not set CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_GPT=y -@@ -79,6 +81,7 @@ CONFIG_SYSRESET=y +@@ -80,6 +82,7 @@ CONFIG_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_TEE=y CONFIG_OPTEE=y diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0047-efi-selftest-add-runtime-variable-tests-with-non-vol.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0047-efi-selftest-add-runtime-variable-tests-with-non-vol.patch index b24f128e..dd8cca05 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0047-efi-selftest-add-runtime-variable-tests-with-non-vol.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0047-efi-selftest-add-runtime-variable-tests-with-non-vol.patch @@ -1,8 +1,8 @@ -From 85edddc46913a19ce9e2dd0cb802a2dac60c9b9d Mon Sep 17 00:00:00 2001 +From 5ad52b35076cb13d403f90bcd99a23e4e8533a77 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Sun, 11 Jan 2026 20:36:45 +0000 -Subject: [PATCH 47/53] efi: selftest: add runtime variable tests with - non-volatile storage +Subject: [PATCH] efi: selftest: add runtime variable tests with non-volatile + storage Extend runtime variable tests for persistent storage @@ -28,7 +28,7 @@ Signed-off-by: Harsimran Singh Tungal 1 file changed, 105 insertions(+), 3 deletions(-) diff --git a/lib/efi_selftest/efi_selftest_variables_runtime.c b/lib/efi_selftest/efi_selftest_variables_runtime.c -index 379c4f9c47b..7c14b9fefd4 100644 +index fd570d673f0..938d0853019 100644 --- a/lib/efi_selftest/efi_selftest_variables_runtime.c +++ b/lib/efi_selftest/efi_selftest_variables_runtime.c @@ -3,6 +3,7 @@ @@ -39,7 +39,7 @@ index 379c4f9c47b..7c14b9fefd4 100644 * * This unit test checks the runtime services for variables after * ExitBootServices(): -@@ -40,7 +41,13 @@ static int setup(const efi_handle_t img_handle, +@@ -22,7 +23,13 @@ static const efi_guid_t efi_rt_var_guid = U_BOOT_EFI_RT_VAR_FILE_GUID; /** * execute() - execute unit test * @@ -54,14 +54,14 @@ index 379c4f9c47b..7c14b9fefd4 100644 */ static int execute(void) { -@@ -57,6 +64,80 @@ static int execute(void) +@@ -39,6 +46,80 @@ static int execute(void) u64 max_storage, rem_storage, max_size; int test_ret; + /* Compare the value of EFI variable if it already exists in non volatile storage */ + if (!IS_ENABLED(CONFIG_EFI_RT_VOLATILE_STORE)) { + len = sizeof(v) / 2; -+ ret = runtime->get_variable(u"efi_st_var0", &guid_vendor0, ++ ret = st_runtime->get_variable(u"efi_st_var0", &guid_vendor0, + &attr, &len, data); + if (ret == EFI_SUCCESS) { + efi_st_printf("EFI Variable efi_st_var0 found. Executing Second Phase\n"); @@ -76,7 +76,7 @@ index 379c4f9c47b..7c14b9fefd4 100644 + + /* Append an existing variable */ + append_len = sizeof(v) - len; -+ ret = runtime->set_variable(u"efi_st_var0", &guid_vendor0, ++ ret = st_runtime->set_variable(u"efi_st_var0", &guid_vendor0, + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS | + EFI_VARIABLE_APPEND_WRITE | @@ -88,7 +88,7 @@ index 379c4f9c47b..7c14b9fefd4 100644 + } + + len = sizeof(v); -+ ret = runtime->get_variable(u"efi_st_var0", &guid_vendor0, ++ ret = st_runtime->get_variable(u"efi_st_var0", &guid_vendor0, + &attr, &len, data); + if (ret != EFI_SUCCESS) { + efi_st_error("GetVariable failed\n"); @@ -106,7 +106,7 @@ index 379c4f9c47b..7c14b9fefd4 100644 + } + + /* Delete it by setting the size to 0 */ -+ ret = runtime->set_variable(u"efi_st_var0", &guid_vendor0, ++ ret = st_runtime->set_variable(u"efi_st_var0", &guid_vendor0, + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS | + EFI_VARIABLE_NON_VOLATILE, @@ -116,7 +116,7 @@ index 379c4f9c47b..7c14b9fefd4 100644 + return EFI_ST_FAILURE; + } + -+ ret = runtime->get_variable(u"efi_st_var0", &guid_vendor0, ++ ret = st_runtime->get_variable(u"efi_st_var0", &guid_vendor0, + &attr, &len, data); + if (ret != EFI_NOT_FOUND) { + efi_st_error("GetVariable failed\n"); @@ -135,16 +135,16 @@ index 379c4f9c47b..7c14b9fefd4 100644 memset(v2, 0x1, sizeof(v2)); if (IS_ENABLED(CONFIG_EFI_VARIABLE_FILE_STORE)) { -@@ -70,7 +151,7 @@ static int execute(void) - ret = runtime->query_variable_info(EFI_VARIABLE_BOOTSERVICE_ACCESS, - &max_storage, &rem_storage, - &max_size); +@@ -53,7 +134,7 @@ static int execute(void) + ret = st_runtime->query_variable_info( + EFI_VARIABLE_BOOTSERVICE_ACCESS, &max_storage, + &rem_storage, &max_size); - if (ret != EFI_UNSUPPORTED) { + if (ret != EFI_ST_SUCCESS) { efi_st_error("QueryVariableInfo failed\n"); return EFI_ST_FAILURE; } -@@ -286,7 +367,28 @@ static int execute(void) +@@ -279,7 +360,28 @@ static int execute(void) return EFI_ST_FAILURE; } } else { @@ -155,7 +155,7 @@ index 379c4f9c47b..7c14b9fefd4 100644 + } + + /* Delete it by setting the size to 0 */ -+ ret = runtime->set_variable(u"efi_st_var0", &guid_vendor0, ++ ret = st_runtime->set_variable(u"efi_st_var0", &guid_vendor0, + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS, + 0, NULL); @@ -165,7 +165,7 @@ index 379c4f9c47b..7c14b9fefd4 100644 + } + + /* Add an 8byte aligned variable */ -+ ret = runtime->set_variable(u"efi_st_var0", &guid_vendor0, ++ ret = st_runtime->set_variable(u"efi_st_var0", &guid_vendor0, + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS | + EFI_VARIABLE_NON_VOLATILE, diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0048-test-dm-add-sandbox-FF-A-runtime-transport-tests.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0048-test-dm-add-sandbox-FF-A-runtime-transport-tests.patch index 8682a181..9992c1e8 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0048-test-dm-add-sandbox-FF-A-runtime-transport-tests.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0048-test-dm-add-sandbox-FF-A-runtime-transport-tests.patch @@ -1,7 +1,7 @@ -From d12b38b7af88fdb37487d5196e214c8a4ad561fc Mon Sep 17 00:00:00 2001 +From 56bb46d57bc6d2f2105d2d6d08e49d6f1396e212 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Wed, 14 Jan 2026 13:55:02 +0000 -Subject: [PATCH 48/53] test: dm: add sandbox FF-A runtime transport tests +Subject: [PATCH] test: dm: add sandbox FF-A runtime transport tests Exercise FF-A runtime helpers via sandbox DM tests @@ -53,7 +53,7 @@ index be2790f4960..a20eb159b73 100644 #define SANDBOX_SERVICE3_UUID "55d532ed-0942-e699-722d-c09ca798d9cd" diff --git a/test/dm/Makefile b/test/dm/Makefile -index 474e77a2151..218b0b1411f 100644 +index 0e3c63568dd..102b1e98284 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -1,7 +1,7 @@ @@ -65,7 +65,7 @@ index 474e77a2151..218b0b1411f 100644 # Tests for particular subsystems - when enabling driver model for a new # subsystem you must add sandbox tests here. -@@ -95,6 +95,7 @@ obj-$(CONFIG_ACPI_PMC) += pmc.o +@@ -98,6 +98,7 @@ obj-$(CONFIG_ACPI_PMC) += pmc.o obj-$(CONFIG_DM_PMIC) += pmic.o obj-$(CONFIG_DM_PWM) += pwm.o obj-$(CONFIG_ARM_FFA_TRANSPORT) += ffa.o diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0049-sandbox-ffa-share-synthetic-partition-metadata-via-m.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0049-sandbox-ffa-share-synthetic-partition-metadata-via-m.patch index f807be49..73d07584 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0049-sandbox-ffa-share-synthetic-partition-metadata-via-m.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0049-sandbox-ffa-share-synthetic-partition-metadata-via-m.patch @@ -1,8 +1,7 @@ -From 6e707fe6a0120a3a6aa7954a250293162a441b21 Mon Sep 17 00:00:00 2001 +From 8747ee23b099a8af0a7d079bec067f6d94cd9ff2 Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Thu, 15 Jan 2026 10:57:48 +0000 -Subject: [PATCH 49/53] sandbox: ffa: share synthetic partition metadata via - macros +Subject: [PATCH] sandbox: ffa: share synthetic partition metadata via macros Reuse sandbox FF-A partition constants in emulator tests @@ -16,7 +15,7 @@ Signed-off-by: Harsimran Singh Tungal 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/drivers/firmware/arm-ffa/ffa-emul-uclass.c b/drivers/firmware/arm-ffa/ffa-emul-uclass.c -index 531ecb12f3a..33d38d37ddb 100644 +index 084c0540988..6e45b0d37f3 100644 --- a/drivers/firmware/arm-ffa/ffa-emul-uclass.c +++ b/drivers/firmware/arm-ffa/ffa-emul-uclass.c @@ -1,6 +1,6 @@ @@ -27,7 +26,7 @@ index 531ecb12f3a..33d38d37ddb 100644 * * Authors: * Abdellatif El Khlifi -@@ -22,41 +22,57 @@ DECLARE_GLOBAL_DATA_PTR; +@@ -19,41 +19,57 @@ /* The partitions (SPs) table */ static struct ffa_partition_desc sandbox_partitions[SANDBOX_PARTITIONS_CNT] = { { diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0050-doc-arm64-document-FF-A-runtime-path-for-EFI-variabl.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0050-doc-arm64-document-FF-A-runtime-path-for-EFI-variabl.patch index f4107244..5801c112 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0050-doc-arm64-document-FF-A-runtime-path-for-EFI-variabl.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0050-doc-arm64-document-FF-A-runtime-path-for-EFI-variabl.patch @@ -1,8 +1,7 @@ -From a4d871a16513e86290aaa2304f0195e533200937 Mon Sep 17 00:00:00 2001 +From 60230fcc1c136544ef28c1d9040f34b3cc9c762d Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Wed, 25 Feb 2026 14:40:19 +0000 -Subject: [PATCH 50/53] doc: arm64: document FF-A runtime path for EFI - variables +Subject: [PATCH] doc: arm64: document FF-A runtime path for EFI variables Document how EFI runtime variables use FF-A MM communication @@ -153,7 +152,7 @@ index d2c4fb49f79..53218cd9c96 100644 .. _`FF-A v1.0 specification`: https://documentation-service.arm.com/static/5fb7e8a6ca04df4095c1d65e .. _`SMC Calling Convention v1.2 specification`: https://documentation-service.arm.com/static/5f8edaeff86e16515cdbe4c6 diff --git a/doc/usage/cmd/armffa.rst b/doc/usage/cmd/armffa.rst -index 4f41e3393fd..5dcc3047a45 100644 +index dbe4d5bc842..2b865f88015 100644 --- a/doc/usage/cmd/armffa.rst +++ b/doc/usage/cmd/armffa.rst @@ -39,6 +39,17 @@ The command also allows to gather secure partitions information and ping these diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0054-corstone1000-a320-enable-bootefi-selftest.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0053-corstone1000-a320-enable-bootefi-selftest.patch similarity index 85% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0054-corstone1000-a320-enable-bootefi-selftest.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0053-corstone1000-a320-enable-bootefi-selftest.patch index f53e2ff2..8ca630b7 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0054-corstone1000-a320-enable-bootefi-selftest.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0053-corstone1000-a320-enable-bootefi-selftest.patch @@ -1,4 +1,4 @@ -From 0da9650a3ed86e63c6a9621d7a9195eb3a75a233 Mon Sep 17 00:00:00 2001 +From e46456082379263c7c8e3a54ace5e1f7926aaf0a Mon Sep 17 00:00:00 2001 From: Harsimran Singh Tungal Date: Fri, 17 Apr 2026 13:41:07 +0100 Subject: [PATCH] corstone1000-a320: enable bootefi selftest @@ -15,10 +15,10 @@ Signed-off-by: Harsimran Singh Tungal 1 file changed, 3 insertions(+) diff --git a/configs/corstone1000-a320_defconfig b/configs/corstone1000-a320_defconfig -index d0ae1e745db..c4dcd1790cc 100644 +index 290c6223bb1..ca28e208564 100644 --- a/configs/corstone1000-a320_defconfig +++ b/configs/corstone1000-a320_defconfig -@@ -41,6 +41,8 @@ CONFIG_SYS_PROMPT="corstone1000# " +@@ -43,6 +43,8 @@ CONFIG_SYS_PROMPT="corstone1000# " # CONFIG_CMD_CONSOLE is not set CONFIG_CMD_FWU_METADATA=y CONFIG_CMD_BOOTZ=y @@ -27,7 +27,7 @@ index d0ae1e745db..c4dcd1790cc 100644 # CONFIG_CMD_XIMG is not set CONFIG_CMD_NVEDIT_EFI=y CONFIG_CMD_GPT=y -@@ -76,6 +78,7 @@ CONFIG_SYSRESET=y +@@ -78,6 +80,7 @@ CONFIG_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_TEE=y CONFIG_OPTEE=y diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0053-efi_loader-fix-AllocatePages-overlap-status.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0053-efi_loader-fix-AllocatePages-overlap-status.patch deleted file mode 100644 index 5f71526f..00000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0053-efi_loader-fix-AllocatePages-overlap-status.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 1be3bcbc0c7efc36b8fbac7ef0f8c8375dc6770d Mon Sep 17 00:00:00 2001 -From: Harsimran Singh Tungal -Date: Sat, 18 Apr 2026 14:26:28 +0100 -Subject: [PATCH 53/53] efi_loader: fix AllocatePages overlap status -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Return EFI_NOT_FOUND for EFI_ALLOCATE_ADDRESS overlap - -When efi_allocate_pages() is called with EFI_ALLOCATE_ADDRESS, UEFI -expects EFI_NOT_FOUND if the requested address range is already -allocated or unavailable. U-Boot currently returns -EFI_OUT_OF_RESOURCES when efi_update_memory_map() detects an overlap -after a successful lmb_alloc_mem(), which does not match -EFI_ALLOCATE_ADDRESS semantics. - -Return EFI_NOT_FOUND for EFI_ALLOCATE_ADDRESS requests that fail due -to an overlapping EFI memory descriptor, while keeping -EFI_OUT_OF_RESOURCES for other allocation types. - -The UEFI specification [1] specifies that -EFI_BOOT_SERVICES.AllocatePages must return EFI_NOT_FOUND when the -requested address range is unavailable or already allocated; -EFI_OUT_OF_RESOURCES applies to non‑address‑specific allocation -failures. - -[1] https://uefi.org/specs/UEFI/2.10_A/07_Services_Boot_Services.html - -Upstream-Status: Submitted [https://lore.kernel.org/u-boot/20260427150530.3156000-1-harsimransingh.tungal@arm.com/] -Signed-off-by: Harsimran Singh Tungal ---- - lib/efi_loader/efi_memory.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c -index b77c2f980cc..63cf1a7277f 100644 ---- a/lib/efi_loader/efi_memory.c -+++ b/lib/efi_loader/efi_memory.c -@@ -510,7 +510,9 @@ efi_status_t efi_allocate_pages(enum efi_allocate_type type, - /* Map would overlap, bail out */ - lmb_free(addr, (u64)pages << EFI_PAGE_SHIFT, flags); - unmap_sysmem((void *)(uintptr_t)efi_addr); -- return EFI_OUT_OF_RESOURCES; -+ if (type == EFI_ALLOCATE_ADDRESS) -+ return EFI_NOT_FOUND; -+ return EFI_OUT_OF_RESOURCES; - } - - *memory = efi_addr; From patchwork Thu Sep 17 11:20:32 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harsimran Singh Tungal X-Patchwork-Id: 98537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22592C982D0 for ; Thu, 17 Sep 2026 11:20:57 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.36697.1789644056008373870 for ; Thu, 17 Sep 2026 04:20:56 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@arm.com header.s=foss header.b=MbNAfBtj; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: harsimransingh.tungal@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F30E51476; Thu, 17 Sep 2026 04:20:51 -0700 (PDT) Received: from e142474.cambridge.arm.com (e142474.arm.com [10.2.203.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EC4CA3F7B4; Thu, 17 Sep 2026 04:20:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1789644055; bh=4oOCh+IBdPNgtyw5UPMVFD/sOdV46KadXOEDe8LnZ1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MbNAfBtjQ13PvNspUa/JHJ8cmhoK7Z2x2cDaL2omIcz4uRpIn7AQdaZO/iOtJ98i3 mP5Y4pM1mtstWUbmEV1RXn36SxsJ9BOB/7aF62CUFKGmqvHWh5J/sL8N0grwC42xa5 rfYmTK5bgR+KONozVa9CcpTBDDekw6ocYb4uL8b4= From: Harsimran Singh Tungal To: meta-arm@lists.yoctoproject.org Cc: Harsimran Singh Tungal , Alex Chapman Subject: [PATCH 2/2] arm-bsp/u-boot: Remove u-boot recipe u-boot_2025.10.bb Date: Thu, 17 Sep 2026 12:20:32 +0100 Message-ID: <20260917112040.3877076-3-harsimransingh.tungal@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260917112040.3877076-1-harsimransingh.tungal@arm.com> References: <20260917112040.3877076-1-harsimransingh.tungal@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 17 Sep 2026 11:20:57 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/7169 Remove the u-boot recipe u-boot_2025.10.bb as new u-boot version 2026.07 is available in core. Signed-off-by: Alex Chapman Signed-off-by: Harsimran Singh Tungal --- meta-arm-bsp/recipes-bsp/u-boot/u-boot_2025.10.bb | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2025.10.bb diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2025.10.bb b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2025.10.bb deleted file mode 100644 index e9a7e52a..00000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2025.10.bb +++ /dev/null @@ -1,12 +0,0 @@ -require recipes-bsp/u-boot/u-boot-common.inc -require recipes-bsp/u-boot/u-boot.inc - -DEPENDS += "bc-native dtc-native gnutls-native python3-pyelftools-native" - -SRCREV = "e50b1e8715011def8aff1588081a2649a2c6cd47" -SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" - -# u-boot/lib/rsa/rsa-sign.c uses the OpenSSL engine API, but this has been removed -# from OpenSSL 4. Upstream u-boot has been fixed but we can enable the stub engine -# API in OpenSSL until this recipe is removed. -BUILD_CFLAGS += "-DOPENSSL_ENGINE_STUBS"