From patchwork Tue Oct 17 07:57:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: harsimransingh.tungal@arm.com X-Patchwork-Id: 32434 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 D5ABDCDB483 for ; Tue, 17 Oct 2023 07:58:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.202021.1697529506581761572 for ; Tue, 17 Oct 2023 00:58:26 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 AAA961007; Tue, 17 Oct 2023 00:59:06 -0700 (PDT) Received: from e132995.cambridge.arm.com (e132995.arm.com [10.1.37.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4891E3F762; Tue, 17 Oct 2023 00:58:25 -0700 (PDT) From: harsimransingh.tungal@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Harsimran Singh Tungal Subject: [PATCH 1/4] arm-bsp/u-boot: corstone1000: Remove External system patches Date: Tue, 17 Oct 2023 08:57:45 +0100 Message-Id: <20231017075748.40743-2-harsimransingh.tungal@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231017075748.40743-1-harsimransingh.tungal@arm.com> References: <20231017075748.40743-1-harsimransingh.tungal@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Oct 2023 07:58:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5125 From: Harsimran Singh Tungal remove the External system patches in uboot as they are not upstreamable. Signed-off-by: Harsimran Singh Tungal --- ...mccc-add-support-for-SMCCCv1.2-x0-x1.patch | 4 +- ...d-introduce-uuid_str_to_le_bin-funct.patch | 4 +- ...d-introduce-testcase-for-uuid_str_to.patch | 4 +- ...5-arm_ffa-introduce-Arm-FF-A-support.patch | 4 +- ...v15-arm_ffa-introduce-armffa-command.patch | 4 +- ...m_ffa-introduce-sandbox-FF-A-support.patch | 4 +- ...-introduce-sandbox-test-cases-for-UC.patch | 4 +- ...-introduce-armffa-command-Sandbox-te.patch | 4 +- ...-efi-introduce-FF-A-MM-communication.patch | 4 +- ...-efi-corstone1000-enable-MM-communic.patch | 4 +- ...000-fwu-introduce-EFI-capsule-update.patch | 4 +- ...000-fix-unrecognized-filesystem-type.patch | 4 +- ...one1000-remove-guid-check-from-corst.patch | 4 +- ...ate-ESRT-table-if-EFI_ESRT-config-op.patch | 4 +- ...-add-get_image_info-for-corstone1000.patch | 4 +- ...ull-pointer-exception-with-get_image.patch | 4 +- ...017-arm-corstone1000-add-mmc-for-fvp.patch | 4 +- ...ne1000-add-compressed-kernel-support.patch | 4 +- ...e-external-sys-driver-to-device-tree.patch | 35 -------- ... 0019-arm-corstone1000-esrt-support.patch} | 4 +- ...d-rpmsg-client-to-u-boot-device-tree.patch | 80 ------------------- ...e1000-enable-distro-booting-command.patch} | 4 +- ...one1000-add-fwu-metadata-store-info.patch} | 6 +- ...ata-make-sure-structures-are-packed.patch} | 4 +- ...=> 0023-corstone1000-add-boot-index.patch} | 4 +- ...djust-boot-bank-and-kernel-location.patch} | 4 +- ...dd-nvmxip-fwu-mdata-and-gpt-options.patch} | 4 +- ... 0026-nvmxip-move-header-to-include.patch} | 4 +- ...0-set-kernel_addr-based-on-boot_idx.patch} | 4 +- ...corstone1000-boot-index-from-active.patch} | 4 +- ...0029-corstone1000-enable-PSCI-reset.patch} | 4 +- ...30-Enable-EFI-set-get-time-services.patch} | 4 +- ...one1000-detect-inflated-kernel-size.patch} | 8 +- ...e1000-ESRT-add-unique-firmware-GUID.patch} | 8 +- ...to-remove-non-compliant-nodes-and-p.patch} | 4 +- ...Call-the-EVT_FT_FIXUP-event-handler.patch} | 4 +- ...1000-purge-U-Boot-specific-DT-nodes.patch} | 4 +- ...0-add-signature-device-tree-overlay.patch} | 8 +- ...enable-authenticated-capsule-config.patch} | 6 +- ...oduce-EFI-authenticated-capsule-upd.patch} | 9 ++- .../recipes-bsp/u-boot/u-boot_%.bbappend | 42 +++++----- 41 files changed, 107 insertions(+), 223 deletions(-) delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0019-Introduce-external-sys-driver-to-device-tree.patch rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0021-arm-corstone1000-esrt-support.patch => 0019-arm-corstone1000-esrt-support.patch} (98%) delete mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-Add-mhu-and-rpmsg-client-to-u-boot-device-tree.patch rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0022-corstone1000-enable-distro-booting-command.patch => 0020-corstone1000-enable-distro-booting-command.patch} (84%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0023-corstone1000-add-fwu-metadata-store-info.patch => 0021-corstone1000-add-fwu-metadata-store-info.patch} (84%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0024-fwu_metadata-make-sure-structures-are-packed.patch => 0022-fwu_metadata-make-sure-structures-are-packed.patch} (90%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0025-corstone1000-add-boot-index.patch => 0023-corstone1000-add-boot-index.patch} (90%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0026-corstone1000-adjust-boot-bank-and-kernel-location.patch => 0024-corstone1000-adjust-boot-bank-and-kernel-location.patch} (89%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0027-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch => 0025-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch} (95%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0028-nvmxip-move-header-to-include.patch => 0026-nvmxip-move-header-to-include.patch} (90%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0029-corstone1000-set-kernel_addr-based-on-boot_idx.patch => 0027-corstone1000-set-kernel_addr-based-on-boot_idx.patch} (96%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0030-corstone1000-boot-index-from-active.patch => 0028-corstone1000-boot-index-from-active.patch} (91%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0031-corstone1000-enable-PSCI-reset.patch => 0029-corstone1000-enable-PSCI-reset.patch} (88%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0032-Enable-EFI-set-get-time-services.patch => 0030-Enable-EFI-set-get-time-services.patch} (89%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0033-corstone1000-detect-inflated-kernel-size.patch => 0031-corstone1000-detect-inflated-kernel-size.patch} (84%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0034-corstone1000-ESRT-add-unique-firmware-GUID.patch => 0032-corstone1000-ESRT-add-unique-firmware-GUID.patch} (90%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0035-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch => 0033-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch} (96%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0036-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch => 0034-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch} (92%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0037-corstone1000-purge-U-Boot-specific-DT-nodes.patch => 0035-corstone1000-purge-U-Boot-specific-DT-nodes.patch} (92%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0038-corstone1000-add-signature-device-tree-overlay.patch => 0036-corstone1000-add-signature-device-tree-overlay.patch} (78%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0039-corstone1000-enable-authenticated-capsule-config.patch => 0037-corstone1000-enable-authenticated-capsule-config.patch} (84%) rename meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/{0040-corstone1000-introduce-EFI-authenticated-capsule-upd.patch => 0038-corstone1000-introduce-EFI-authenticated-capsule-upd.patch} (93%) diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-FF-A-v15-arm64-smccc-add-support-for-SMCCCv1.2-x0-x1.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-FF-A-v15-arm64-smccc-add-support-for-SMCCCv1.2-x0-x1.patch index df633e2f..485ed4ba 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-FF-A-v15-arm64-smccc-add-support-for-SMCCCv1.2-x0-x1.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0001-FF-A-v15-arm64-smccc-add-support-for-SMCCCv1.2-x0-x1.patch @@ -1,7 +1,7 @@ -From b79722ade56bd49cf9e7d9b47b6256599c8cdb36 Mon Sep 17 00:00:00 2001 +From 6b7a5bff8d68b191569557b6444e2c5061af8074 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Fri, 29 Jul 2022 13:06:19 +0100 -Subject: [PATCH 01/33] FF-A v15: arm64: smccc: add support for SMCCCv1.2 +Subject: [PATCH 01/38] FF-A v15: arm64: smccc: add support for SMCCCv1.2 x0-x17 registers add support for x0-x17 registers used by the SMC calls diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-FF-A-v15-lib-uuid-introduce-uuid_str_to_le_bin-funct.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-FF-A-v15-lib-uuid-introduce-uuid_str_to_le_bin-funct.patch index 550be6be..ebb2b556 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-FF-A-v15-lib-uuid-introduce-uuid_str_to_le_bin-funct.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0002-FF-A-v15-lib-uuid-introduce-uuid_str_to_le_bin-funct.patch @@ -1,7 +1,7 @@ -From 43137871fcc46513eea1480cd78ad091763578f0 Mon Sep 17 00:00:00 2001 +From faa2a74ce8cc9497c551b1bee6beed5c2c2f2dee Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 4 Aug 2022 16:46:47 +0100 -Subject: [PATCH 02/33] FF-A v15: lib: uuid: introduce uuid_str_to_le_bin +Subject: [PATCH 02/38] FF-A v15: lib: uuid: introduce uuid_str_to_le_bin function convert UUID string to little endian binary data diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-FF-A-v15-lib-uuid-introduce-testcase-for-uuid_str_to.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-FF-A-v15-lib-uuid-introduce-testcase-for-uuid_str_to.patch index bbd4e048..dbdf2962 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-FF-A-v15-lib-uuid-introduce-testcase-for-uuid_str_to.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0003-FF-A-v15-lib-uuid-introduce-testcase-for-uuid_str_to.patch @@ -1,7 +1,7 @@ -From 80fd758cb55f8b44078b4535284ea132b0d5a944 Mon Sep 17 00:00:00 2001 +From fa4a5b45d0254e347ba15992d997529f5056fe8f Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 27 Mar 2023 16:24:29 +0100 -Subject: [PATCH 03/33] FF-A v15: lib: uuid: introduce testcase for +Subject: [PATCH 03/38] FF-A v15: lib: uuid: introduce testcase for uuid_str_to_le_bin provide a test case diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-FF-A-v15-arm_ffa-introduce-Arm-FF-A-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-FF-A-v15-arm_ffa-introduce-Arm-FF-A-support.patch index f0d67639..e2c9d86e 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-FF-A-v15-arm_ffa-introduce-Arm-FF-A-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0004-FF-A-v15-arm_ffa-introduce-Arm-FF-A-support.patch @@ -1,7 +1,7 @@ -From e8b71ec24884a0c973ac663e6802ff529a8be349 Mon Sep 17 00:00:00 2001 +From 6a50d03467b70220b615dbe87b4b49d7f86fcb2f Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 17 Jul 2023 15:11:43 +0100 -Subject: [PATCH 04/33] FF-A v15: arm_ffa: introduce Arm FF-A support +Subject: [PATCH 04/38] FF-A v15: arm_ffa: introduce Arm FF-A support Add Arm FF-A support implementing Arm Firmware Framework for Armv8-A v1.0 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-FF-A-v15-arm_ffa-introduce-armffa-command.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-FF-A-v15-arm_ffa-introduce-armffa-command.patch index aeb4bb90..0a4f4c9d 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-FF-A-v15-arm_ffa-introduce-armffa-command.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0005-FF-A-v15-arm_ffa-introduce-armffa-command.patch @@ -1,7 +1,7 @@ -From 3eb4fb19777383f5f05b7ce74da141f53ffc4374 Mon Sep 17 00:00:00 2001 +From 2d225908fde28c9759fae7a9fdce6bb8c39ec579 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Wed, 10 May 2023 17:27:01 +0100 -Subject: [PATCH 05/33] FF-A v15: arm_ffa: introduce armffa command +Subject: [PATCH 05/38] FF-A v15: arm_ffa: introduce armffa command Provide armffa command showcasing the use of the U-Boot FF-A support diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-FF-A-v15-arm_ffa-introduce-sandbox-FF-A-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-FF-A-v15-arm_ffa-introduce-sandbox-FF-A-support.patch index 4f94b722..13ea2275 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-FF-A-v15-arm_ffa-introduce-sandbox-FF-A-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0006-FF-A-v15-arm_ffa-introduce-sandbox-FF-A-support.patch @@ -1,7 +1,7 @@ -From 4f104ef6804ffd6483d166840d113630be85edb0 Mon Sep 17 00:00:00 2001 +From 8b24115d3b41af53602bfc80bea7e134dc0edefb Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 17 Jul 2023 15:18:58 +0100 -Subject: [PATCH 06/33] FF-A v15: arm_ffa: introduce sandbox FF-A support +Subject: [PATCH 06/38] FF-A v15: arm_ffa: introduce sandbox FF-A support Emulate Secure World's FF-A ABIs and allow testing U-Boot FF-A support diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0007-FF-A-v15-arm_ffa-introduce-sandbox-test-cases-for-UC.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0007-FF-A-v15-arm_ffa-introduce-sandbox-test-cases-for-UC.patch index 966c32bd..72330793 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0007-FF-A-v15-arm_ffa-introduce-sandbox-test-cases-for-UC.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0007-FF-A-v15-arm_ffa-introduce-sandbox-test-cases-for-UC.patch @@ -1,7 +1,7 @@ -From 00d0d8edf47430e3069e7c1dfa7a5bb7bb36bd49 Mon Sep 17 00:00:00 2001 +From 9c789dbc70d58f55c84cc02ac35783af0aae85d5 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Wed, 10 May 2023 17:34:55 +0100 -Subject: [PATCH 07/33] FF-A v15: arm_ffa: introduce sandbox test cases for +Subject: [PATCH 07/38] FF-A v15: arm_ffa: introduce sandbox test cases for UCLASS_FFA Add functional test cases for the FF-A support diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-FF-A-v15-arm_ffa-introduce-armffa-command-Sandbox-te.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-FF-A-v15-arm_ffa-introduce-armffa-command-Sandbox-te.patch index 05b5e4d1..5d70db68 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-FF-A-v15-arm_ffa-introduce-armffa-command-Sandbox-te.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0008-FF-A-v15-arm_ffa-introduce-armffa-command-Sandbox-te.patch @@ -1,7 +1,7 @@ -From 78547a9f322b981a93bbeeb48b3eda1d2ab35cd0 Mon Sep 17 00:00:00 2001 +From 95589fd6c92d41aa22d30a34193006216c6ee827 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Fri, 23 Jun 2023 13:44:10 +0100 -Subject: [PATCH 08/33] FF-A v15: arm_ffa: introduce armffa command Sandbox +Subject: [PATCH 08/38] FF-A v15: arm_ffa: introduce armffa command Sandbox test Add Sandbox test for the armffa command diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0009-FF-A-v15-arm_ffa-efi-introduce-FF-A-MM-communication.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0009-FF-A-v15-arm_ffa-efi-introduce-FF-A-MM-communication.patch index bd75bc1d..6f663fab 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0009-FF-A-v15-arm_ffa-efi-introduce-FF-A-MM-communication.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0009-FF-A-v15-arm_ffa-efi-introduce-FF-A-MM-communication.patch @@ -1,7 +1,7 @@ -From 342844c2a5ad6beb127e1e8e52b311df77cff472 Mon Sep 17 00:00:00 2001 +From 02e38e24676d48d8a792ab6631a903ae1faa6271 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 15 Aug 2022 15:12:49 +0100 -Subject: [PATCH 09/33] FF-A v15: arm_ffa: efi: introduce FF-A MM communication +Subject: [PATCH 09/38] FF-A v15: arm_ffa: efi: introduce FF-A MM communication Add MM communication support using FF-A transport diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-FF-A-v15-arm_ffa-efi-corstone1000-enable-MM-communic.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-FF-A-v15-arm_ffa-efi-corstone1000-enable-MM-communic.patch index 4dcec1dc..bc71b946 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-FF-A-v15-arm_ffa-efi-corstone1000-enable-MM-communic.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0010-FF-A-v15-arm_ffa-efi-corstone1000-enable-MM-communic.patch @@ -1,7 +1,7 @@ -From 79e941be83a7394d03b09c618c8e2924ef962d64 Mon Sep 17 00:00:00 2001 +From c726c9ff098e4b271d60856b462f3dc532763a03 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 17 Jul 2023 15:23:33 +0100 -Subject: [PATCH 10/33] FF-A v15: arm_ffa: efi: corstone1000: enable MM +Subject: [PATCH 10/38] FF-A v15: arm_ffa: efi: corstone1000: enable MM communication turn on EFI MM communication diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0011-efi-corstone1000-fwu-introduce-EFI-capsule-update.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0011-efi-corstone1000-fwu-introduce-EFI-capsule-update.patch index d2c440c8..00d6ea72 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0011-efi-corstone1000-fwu-introduce-EFI-capsule-update.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0011-efi-corstone1000-fwu-introduce-EFI-capsule-update.patch @@ -1,7 +1,7 @@ -From 90b2741149a538c93aed61522c0d3363351bd578 Mon Sep 17 00:00:00 2001 +From 4483f276e70afdd961449ac45d4d8121c2a9080c Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 17 Jul 2023 15:56:18 +0100 -Subject: [PATCH 11/33] efi: corstone1000: fwu: introduce EFI capsule update +Subject: [PATCH 11/38] efi: corstone1000: fwu: introduce EFI capsule update This commit provides capsule update feature for Corstone1000. diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-arm-corstone1000-fix-unrecognized-filesystem-type.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-arm-corstone1000-fix-unrecognized-filesystem-type.patch index f9fb70b5..023d53c2 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-arm-corstone1000-fix-unrecognized-filesystem-type.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0012-arm-corstone1000-fix-unrecognized-filesystem-type.patch @@ -1,7 +1,7 @@ -From 445dfd4a5d8f31a7efb3f2f15aa677de8b3eb602 Mon Sep 17 00:00:00 2001 +From 7844378788f308f3540c5eb10956c84113005fcc Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Fri, 4 Mar 2022 15:56:09 +0000 -Subject: [PATCH 12/33] arm: corstone1000: fix unrecognized filesystem type +Subject: [PATCH 12/38] arm: corstone1000: fix unrecognized filesystem type Some usb sticks are not recognized by usb, just add a delay before checking status. diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-efi_loader-corstone1000-remove-guid-check-from-corst.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-efi_loader-corstone1000-remove-guid-check-from-corst.patch index 4ddb35ea..71cdf6ac 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-efi_loader-corstone1000-remove-guid-check-from-corst.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0013-efi_loader-corstone1000-remove-guid-check-from-corst.patch @@ -1,7 +1,7 @@ -From 68248cd3cc95e0480ee2cbc3ebaba51967889199 Mon Sep 17 00:00:00 2001 +From 94e6c1dee044b3573991e48449de9144cfe3c0f3 Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Sat, 11 Dec 2021 13:23:55 +0000 -Subject: [PATCH 13/33] efi_loader: corstone1000: remove guid check from +Subject: [PATCH 13/38] efi_loader: corstone1000: remove guid check from corstone1000 config option Use generic fmp guid and no separte check is required for diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch index c0b3fa82..9d3cb666 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0014-efi_loader-populate-ESRT-table-if-EFI_ESRT-config-op.patch @@ -1,7 +1,7 @@ -From bb0eb602d3697384318cac90605259aa7fb21c9b Mon Sep 17 00:00:00 2001 +From 9be08ccf3f7b30b2c57ff2eb593c5b17c967fc4a Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Fri, 17 Dec 2021 19:49:02 +0000 -Subject: [PATCH 14/33] efi_loader: populate ESRT table if EFI_ESRT config +Subject: [PATCH 14/38] efi_loader: populate ESRT table if EFI_ESRT config option is set This change is to call efi_esrt_populate function if CONFIG_EFI_ESRT diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_firmware-add-get_image_info-for-corstone1000.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_firmware-add-get_image_info-for-corstone1000.patch index 2186330e..c74c7c03 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_firmware-add-get_image_info-for-corstone1000.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0015-efi_firmware-add-get_image_info-for-corstone1000.patch @@ -1,7 +1,7 @@ -From 5e12999d179e84ac52e242d56c57a4d429651124 Mon Sep 17 00:00:00 2001 +From 03fe979677509f974b8d56097fbbd6c7e4cbe20b Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Fri, 17 Dec 2021 19:50:25 +0000 -Subject: [PATCH 15/33] efi_firmware: add get_image_info for corstone1000 +Subject: [PATCH 15/38] efi_firmware: add get_image_info for corstone1000 This change is to populate get_image_info which eventually will be populated in ESRT table diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_loader-fix-null-pointer-exception-with-get_image.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_loader-fix-null-pointer-exception-with-get_image.patch index b58c1d79..655e0142 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_loader-fix-null-pointer-exception-with-get_image.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0016-efi_loader-fix-null-pointer-exception-with-get_image.patch @@ -1,7 +1,7 @@ -From 957e88fc52d77e6a3024f06bebfaa713c9e99e59 Mon Sep 17 00:00:00 2001 +From 13bf700129e902ba7ae556babcfb9c7956f32571 Mon Sep 17 00:00:00 2001 From: Vishnu Banavath Date: Fri, 14 Jan 2022 15:24:18 +0000 -Subject: [PATCH 16/33] efi_loader: fix null pointer exception with +Subject: [PATCH 16/38] efi_loader: fix null pointer exception with get_image_info get_img_info API implemented for corstone1000 target does not diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-arm-corstone1000-add-mmc-for-fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-arm-corstone1000-add-mmc-for-fvp.patch index 75fe64c2..dd746d91 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-arm-corstone1000-add-mmc-for-fvp.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0017-arm-corstone1000-add-mmc-for-fvp.patch @@ -1,7 +1,7 @@ -From 61b5f50718431b5fff57fcaa924238135b11ed3c Mon Sep 17 00:00:00 2001 +From e07a03678e72afa7a5d2ab66ce2e1a21e0a73cfc Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Mon, 17 Jul 2023 16:50:53 +0100 -Subject: [PATCH 17/33] arm:corstone1000: add mmc for fvp +Subject: [PATCH 17/38] arm:corstone1000: add mmc for fvp Enable support mmc/sdcard for the corstone1000 FVP. diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0018-corstone1000-add-compressed-kernel-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0018-corstone1000-add-compressed-kernel-support.patch index 0f28cdf3..97cf4d0e 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0018-corstone1000-add-compressed-kernel-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0018-corstone1000-add-compressed-kernel-support.patch @@ -1,7 +1,7 @@ -From a5879f1e7d91fc31058ba75b499d77cab080d611 Mon Sep 17 00:00:00 2001 +From b5cfd8ab77e7f305b170a8cd25575e8cc08babc5 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Wed, 30 Nov 2022 18:59:59 +0000 -Subject: [PATCH 18/33] corstone1000: add compressed kernel support +Subject: [PATCH 18/38] corstone1000: add compressed kernel support The corstone1000 kernel has become too large to fit in the available storage. Swtiching to a compressed kernel avoids the problem, but diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0019-Introduce-external-sys-driver-to-device-tree.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0019-Introduce-external-sys-driver-to-device-tree.patch deleted file mode 100644 index a4c66254..00000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0019-Introduce-external-sys-driver-to-device-tree.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0748658414dd02cec0219841a86c4e7b99bfc171 Mon Sep 17 00:00:00 2001 -From: Emekcan -Date: Wed, 30 Nov 2022 19:02:26 +0000 -Subject: [PATCH 19/33] Introduce external sys driver to device-tree - -It adds external sys driver binding to u-boot -device tree. - -Signed-off-by: Emekcan Aras -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Rui Miguel Silva ---- - arch/arm/dts/corstone1000.dtsi | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/arch/arm/dts/corstone1000.dtsi b/arch/arm/dts/corstone1000.dtsi -index 533dfdf8e1..a834d38454 100644 ---- a/arch/arm/dts/corstone1000.dtsi -+++ b/arch/arm/dts/corstone1000.dtsi -@@ -167,5 +167,12 @@ - secure-status = "okay"; /* secure-world-only */ - status = "disabled"; - }; -+ -+ extsys0: extsys@1A010310 { -+ compatible = "arm,extsys_ctrl"; -+ reg = <0x1A010310 0x4>, -+ <0x1A010314 0X4>; -+ reg-names = "rstreg", "streg"; -+ }; - }; - }; --- -2.25.1 - diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-arm-corstone1000-esrt-support.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0019-arm-corstone1000-esrt-support.patch similarity index 98% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-arm-corstone1000-esrt-support.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0019-arm-corstone1000-esrt-support.patch index 369613eb..11e5124a 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-arm-corstone1000-esrt-support.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0019-arm-corstone1000-esrt-support.patch @@ -1,7 +1,7 @@ -From 0380dee4df6ef11bb08a9c44119b41c58afc562d Mon Sep 17 00:00:00 2001 +From d7682e9f7c45fffe5be0bc67ee9e31fdca1b94c5 Mon Sep 17 00:00:00 2001 From: Satish Kumar Date: Wed, 30 Nov 2022 19:11:43 +0000 -Subject: [PATCH 21/33] arm/corstone1000: esrt support +Subject: [PATCH 19/38] arm/corstone1000: esrt support The implementation is platform specific and would require change in future. diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-Add-mhu-and-rpmsg-client-to-u-boot-device-tree.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-Add-mhu-and-rpmsg-client-to-u-boot-device-tree.patch deleted file mode 100644 index f3b1503c..00000000 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-Add-mhu-and-rpmsg-client-to-u-boot-device-tree.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 396229d3d29d9cfd5e2567be5427a9066072e32f Mon Sep 17 00:00:00 2001 -From: Emekcan -Date: Mon, 12 Sep 2022 15:47:06 +0100 -Subject: [PATCH 20/33] Add mhu and rpmsg client to u-boot device tree - -Adds external system controller and mhu driver to u-boot -device tree. This enables communication between host and -the external system. - -Signed-off-by: Emekcan Aras -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Rui Miguel Silva ---- - arch/arm/dts/corstone1000.dtsi | 50 ++++++++++++++++++++++++++++++++++ - 1 file changed, 50 insertions(+) - -diff --git a/arch/arm/dts/corstone1000.dtsi b/arch/arm/dts/corstone1000.dtsi -index a834d38454..18c4d1e19a 100644 ---- a/arch/arm/dts/corstone1000.dtsi -+++ b/arch/arm/dts/corstone1000.dtsi -@@ -168,6 +168,56 @@ - status = "disabled"; - }; - -+ mbox_es0mhu0_tx: mhu@1b000000 { -+ compatible = "arm,mhuv2-tx","arm,primecell"; -+ reg = <0x1b000000 0x1000>; -+ clocks = <&refclk100mhz>; -+ clock-names = "apb_pclk"; -+ interrupts = ; -+ #mbox-cells = <2>; -+ arm,mhuv2-protocols = <1 1>; -+ mbox-name = "arm-es0-mhu0_tx"; -+ }; -+ -+ mbox_es0mhu0_rx: mhu@1b010000 { -+ compatible = "arm,mhuv2-rx","arm,primecell"; -+ reg = <0x1b010000 0x1000>; -+ clocks = <&refclk100mhz>; -+ clock-names = "apb_pclk"; -+ interrupts = ; -+ #mbox-cells = <2>; -+ arm,mhuv2-protocols = <1 1>; -+ mbox-name = "arm-es0-mhu0_rx"; -+ }; -+ -+ mbox_es0mhu1_tx: mhu@1b020000 { -+ compatible = "arm,mhuv2-tx","arm,primecell"; -+ reg = <0x1b020000 0x1000>; -+ clocks = <&refclk100mhz>; -+ clock-names = "apb_pclk"; -+ interrupts = ; -+ #mbox-cells = <2>; -+ arm,mhuv2-protocols = <1 1>; -+ mbox-name = "arm-es0-mhu1_tx"; -+ }; -+ -+ mbox_es0mhu1_rx: mhu@1b030000 { -+ compatible = "arm,mhuv2-rx","arm,primecell"; -+ reg = <0x1b030000 0x1000>; -+ clocks = <&refclk100mhz>; -+ clock-names = "apb_pclk"; -+ interrupts = ; -+ #mbox-cells = <2>; -+ arm,mhuv2-protocols = <1 1>; -+ mbox-name = "arm-es0-mhu1_rx"; -+ }; -+ -+ client { -+ compatible = "arm,client"; -+ mboxes = <&mbox_es0mhu0_tx 0 0>, <&mbox_es0mhu1_tx 0 0>, <&mbox_es0mhu0_rx 0 0>, <&mbox_es0mhu1_rx 0 0>; -+ mbox-names = "es0mhu0_tx", "es0mhu1_tx", "es0mhu0_rx", "es0mhu1_rx"; -+ }; -+ - extsys0: extsys@1A010310 { - compatible = "arm,extsys_ctrl"; - reg = <0x1A010310 0x4>, --- -2.25.1 - diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-corstone1000-enable-distro-booting-command.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-corstone1000-enable-distro-booting-command.patch similarity index 84% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-corstone1000-enable-distro-booting-command.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-corstone1000-enable-distro-booting-command.patch index 6f04081c..ba9aeeb7 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-corstone1000-enable-distro-booting-command.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0020-corstone1000-enable-distro-booting-command.patch @@ -1,7 +1,7 @@ -From b3c9b57d862060b7d112725a567c0ff24184c6e1 Mon Sep 17 00:00:00 2001 +From 0094eb1e6ca78988f105fefb69dd5cc9046c89fe Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Mon, 5 Dec 2022 17:02:32 +0000 -Subject: [PATCH 22/33] corstone1000: enable distro booting command +Subject: [PATCH 20/38] corstone1000: enable distro booting command enable distro_bootcmd diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0023-corstone1000-add-fwu-metadata-store-info.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-corstone1000-add-fwu-metadata-store-info.patch similarity index 84% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0023-corstone1000-add-fwu-metadata-store-info.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-corstone1000-add-fwu-metadata-store-info.patch index 6b347962..e524d832 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0023-corstone1000-add-fwu-metadata-store-info.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0021-corstone1000-add-fwu-metadata-store-info.patch @@ -1,7 +1,7 @@ -From 10265c2006291f961cc4fdbbffdec6c5f52bf73b Mon Sep 17 00:00:00 2001 +From 7f0ab0707b476d141bcf16de78d09c793b3b7387 Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Wed, 1 Feb 2023 15:58:07 +0000 -Subject: [PATCH 23/33] corstone1000: add fwu-metadata store info +Subject: [PATCH 21/38] corstone1000: add fwu-metadata store info Add fwu-mdata node and handle for the reference nvmxip-qspi. @@ -13,7 +13,7 @@ Signed-off-by: Rui Miguel Silva 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/corstone1000.dtsi b/arch/arm/dts/corstone1000.dtsi -index 18c4d1e19a..25a032b6b3 100644 +index 533dfdf8e1..1e0ec075e4 100644 --- a/arch/arm/dts/corstone1000.dtsi +++ b/arch/arm/dts/corstone1000.dtsi @@ -38,7 +38,7 @@ diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-fwu_metadata-make-sure-structures-are-packed.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-fwu_metadata-make-sure-structures-are-packed.patch similarity index 90% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-fwu_metadata-make-sure-structures-are-packed.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-fwu_metadata-make-sure-structures-are-packed.patch index 88566a6f..addd1df2 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-fwu_metadata-make-sure-structures-are-packed.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0022-fwu_metadata-make-sure-structures-are-packed.patch @@ -1,7 +1,7 @@ -From 046e54d0152987163355e33fe260419dfcf3b8bb Mon Sep 17 00:00:00 2001 +From b2e413049dcf3dcbe3891a8a70bdd36f30b2e6c8 Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Wed, 1 Feb 2023 16:13:24 +0000 -Subject: [PATCH 24/33] fwu_metadata: make sure structures are packed +Subject: [PATCH 22/38] fwu_metadata: make sure structures are packed The fwu metadata in the metadata partitions should/are packed to guarantee that the info is diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-add-boot-index.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0023-corstone1000-add-boot-index.patch similarity index 90% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-add-boot-index.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0023-corstone1000-add-boot-index.patch index 45ec44fb..b4be24f4 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-add-boot-index.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0023-corstone1000-add-boot-index.patch @@ -1,7 +1,7 @@ -From 92f471d3195e3893f463b11d49f0db62793ca585 Mon Sep 17 00:00:00 2001 +From 62eaf5720bfe49feedf486c57ce9b9968360460c Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Mon, 17 Jul 2023 17:04:10 +0100 -Subject: [PATCH 25/33] corstone1000: add boot index +Subject: [PATCH 23/38] corstone1000: add boot index it is expected that the firmware that runs before u-boot somehow provide the information of the bank diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-corstone1000-adjust-boot-bank-and-kernel-location.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-corstone1000-adjust-boot-bank-and-kernel-location.patch similarity index 89% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-corstone1000-adjust-boot-bank-and-kernel-location.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-corstone1000-adjust-boot-bank-and-kernel-location.patch index 9a889eaf..ddf80f3e 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-corstone1000-adjust-boot-bank-and-kernel-location.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0024-corstone1000-adjust-boot-bank-and-kernel-location.patch @@ -1,7 +1,7 @@ -From 6ea58b2450c72036551e59186888474bcb54a194 Mon Sep 17 00:00:00 2001 +From 147f98fbefc7e13d1b9a3ae4b5fd3adc30dbed6b Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Wed, 1 Feb 2023 16:17:21 +0000 -Subject: [PATCH 26/33] corstone1000: adjust boot bank and kernel location +Subject: [PATCH 24/38] corstone1000: adjust boot bank and kernel location Adjust in the env boot script the address of the bootbank with the new gpt layout, and also the diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch similarity index 95% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch index 621b9d17..78334059 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0025-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch @@ -1,7 +1,7 @@ -From af1bb3af4ff7bb9486dc9489d27605b8eded45b9 Mon Sep 17 00:00:00 2001 +From ff2e0fe577c5a564a10bcc730392dd5397f6cb34 Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Mon, 17 Jul 2023 17:33:52 +0100 -Subject: [PATCH 27/33] corstone1000: add nvmxip, fwu-mdata and gpt options +Subject: [PATCH 25/38] corstone1000: add nvmxip, fwu-mdata and gpt options Enable the newest features: nvmxip, fwu-metadata and gpt. Commands to print the partition info, gpt info diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-nvmxip-move-header-to-include.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-nvmxip-move-header-to-include.patch similarity index 90% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-nvmxip-move-header-to-include.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-nvmxip-move-header-to-include.patch index aac5a1d2..ec38a519 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-nvmxip-move-header-to-include.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0026-nvmxip-move-header-to-include.patch @@ -1,7 +1,7 @@ -From 050c2d8577fd98f20c8b96dab3e4c42c8508b6bc Mon Sep 17 00:00:00 2001 +From 2214be0f540121767d7b6ec4910a7389a1edd13c Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Fri, 9 Jun 2023 13:31:53 +0100 -Subject: [PATCH 28/33] nvmxip: move header to include +Subject: [PATCH 26/38] nvmxip: move header to include Move header to include to allow external code to get the internal bdev structures to access diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-set-kernel_addr-based-on-boot_idx.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-set-kernel_addr-based-on-boot_idx.patch similarity index 96% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-set-kernel_addr-based-on-boot_idx.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-set-kernel_addr-based-on-boot_idx.patch index 6ad46485..a95a8c67 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-set-kernel_addr-based-on-boot_idx.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0027-corstone1000-set-kernel_addr-based-on-boot_idx.patch @@ -1,7 +1,7 @@ -From c547f3335ddff71a7f4915dc0c99ccbcdbf24b54 Mon Sep 17 00:00:00 2001 +From c615b2e0fe9440b27b83f32c62fdc7f996237b56 Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Tue, 18 Jul 2023 12:14:47 +0100 -Subject: [PATCH 29/33] corstone1000: set kernel_addr based on boot_idx +Subject: [PATCH 27/38] corstone1000: set kernel_addr based on boot_idx We need to distinguish between boot banks and from which partition to load the kernel+initramfs to memory. diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-corstone1000-boot-index-from-active.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-corstone1000-boot-index-from-active.patch similarity index 91% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-corstone1000-boot-index-from-active.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-corstone1000-boot-index-from-active.patch index e59a434b..5b68e12a 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-corstone1000-boot-index-from-active.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0028-corstone1000-boot-index-from-active.patch @@ -1,7 +1,7 @@ -From faeeeecba2a7c8c507280ce369e3779f7c63d1e4 Mon Sep 17 00:00:00 2001 +From 747da6c0d1f2558ebeaf01ba9f762efa58a08a72 Mon Sep 17 00:00:00 2001 From: Rui Miguel Silva Date: Mon, 27 Feb 2023 14:40:13 +0000 -Subject: [PATCH 30/33] corstone1000: boot index from active +Subject: [PATCH 28/38] corstone1000: boot index from active In our platform, the Secure Enclave is the one who control all the boot tries and status, so, every time we get here diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0031-corstone1000-enable-PSCI-reset.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-enable-PSCI-reset.patch similarity index 88% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0031-corstone1000-enable-PSCI-reset.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-enable-PSCI-reset.patch index 9ba0205c..828661cd 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0031-corstone1000-enable-PSCI-reset.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0029-corstone1000-enable-PSCI-reset.patch @@ -1,7 +1,7 @@ -From 0524aa417c4989bf03366f13a2456b3bcb72fb87 Mon Sep 17 00:00:00 2001 +From af7054ffdb1f84875a652c6b968dacf9a29cdc9c Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Tue, 18 Jul 2023 12:19:17 +0100 -Subject: [PATCH 31/33] corstone1000: enable PSCI reset +Subject: [PATCH 29/38] corstone1000: enable PSCI reset Even though corstone1000 does not implement entire PSCI APIs,it relies on PSCI reset interface for the system reset. U-boot change the config name, so we diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0032-Enable-EFI-set-get-time-services.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-Enable-EFI-set-get-time-services.patch similarity index 89% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0032-Enable-EFI-set-get-time-services.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-Enable-EFI-set-get-time-services.patch index acc35f17..437ee885 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0032-Enable-EFI-set-get-time-services.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0030-Enable-EFI-set-get-time-services.patch @@ -1,7 +1,7 @@ -From 0ba2b25a9c1dd9c63615bf6830cfb470f33a31b5 Mon Sep 17 00:00:00 2001 +From 8ee7a9c05eb1abe10be139f439f2adf638614290 Mon Sep 17 00:00:00 2001 From: Gowtham Suresh Kumar Date: Tue, 18 Jul 2023 12:21:39 +0100 -Subject: [PATCH 32/33] Enable EFI set/get time services +Subject: [PATCH 30/38] Enable EFI set/get time services SetTime_Conf and SetTime_Func tests in UEFI SCT test suite of ACS fails with unsupported return value. CONFIG_EFI_SET_TIME and diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0033-corstone1000-detect-inflated-kernel-size.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0031-corstone1000-detect-inflated-kernel-size.patch similarity index 84% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0033-corstone1000-detect-inflated-kernel-size.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0031-corstone1000-detect-inflated-kernel-size.patch index 9fd5b33b..0a61fd4b 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0033-corstone1000-detect-inflated-kernel-size.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0031-corstone1000-detect-inflated-kernel-size.patch @@ -1,7 +1,7 @@ -From b57e05e95735b9b58e81b7a67f483b645c56811e Mon Sep 17 00:00:00 2001 +From b65511da443c07b45151b30ea2dc280219f4252b Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Fri, 11 Aug 2023 10:41:19 +0100 -Subject: [PATCH] corstone1000: detect inflated kernel size +Subject: [PATCH 31/38] corstone1000: detect inflated kernel size use filesize variable set by unzip command @@ -12,10 +12,10 @@ Signed-off-by: Abdellatif El Khlifi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/corstone1000_defconfig b/configs/corstone1000_defconfig -index b6b1ccdd78..8a10bca069 100644 +index a0af413de8..5b0b2ac3bf 100644 --- a/configs/corstone1000_defconfig +++ b/configs/corstone1000_defconfig -@@ -17,7 +17,7 @@ CONFIG_FIT=y +@@ -15,7 +15,7 @@ CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyAMA0 loglevel=9 ip=dhcp earlyprintk" diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-corstone1000-ESRT-add-unique-firmware-GUID.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0032-corstone1000-ESRT-add-unique-firmware-GUID.patch similarity index 90% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-corstone1000-ESRT-add-unique-firmware-GUID.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0032-corstone1000-ESRT-add-unique-firmware-GUID.patch index 197a0695..34e45450 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-corstone1000-ESRT-add-unique-firmware-GUID.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0032-corstone1000-ESRT-add-unique-firmware-GUID.patch @@ -1,7 +1,7 @@ -From 98b33cc6b3a56f56224e0a6fe6c3564de7b1341a Mon Sep 17 00:00:00 2001 +From 7e63d4982fd4436d9d0d9abebd9e0ed1473f5237 Mon Sep 17 00:00:00 2001 From: Anusmita Dutta Mazumder Date: Tue, 8 Aug 2023 10:24:39 +0000 -Subject: [PATCH] corstone1000: ESRT: add unique firmware GUID +Subject: [PATCH 32/38] corstone1000: ESRT: add unique firmware GUID Add unique Corstone-1000 firmware GUID @@ -12,7 +12,7 @@ Signed-off-by: Anusmita Dutta Mazumder 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/efi_loader/efi_firmware.c b/lib/efi_loader/efi_firmware.c -index 6135f8ed1c..c9117ae2b2 100644 +index c6ab6e2182..7792a6aa83 100644 --- a/lib/efi_loader/efi_firmware.c +++ b/lib/efi_loader/efi_firmware.c @@ -20,12 +20,12 @@ @@ -43,5 +43,5 @@ index 6135f8ed1c..c9117ae2b2 100644 ret = efi_fill_image_desc_array(image_info_size, image_info, descriptor_version, descriptor_count, -- -2.38.1 +2.25.1 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0033-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch similarity index 96% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0033-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch index 25a7aa30..ea5e0ef8 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0033-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch @@ -1,7 +1,7 @@ -From a37ab0c2578a4627111022d2d1f27f9efa1c2b76 Mon Sep 17 00:00:00 2001 +From a8ecc3ce0fcabb2414a000b7c8bfe3ce46d4392c Mon Sep 17 00:00:00 2001 From: Sughosh Ganu Date: Thu, 21 Sep 2023 14:13:42 +0100 -Subject: [PATCH 35/37] dt: Provide a way to remove non-compliant nodes and +Subject: [PATCH 33/38] dt: Provide a way to remove non-compliant nodes and properties Add a function which is registered to spy for a EVT_FT_FIXUP event, diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch similarity index 92% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch index 2eb273af..c44b6e33 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0034-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch @@ -1,7 +1,7 @@ -From 729c0163ae6aed76b3267b95d2989e70ded66716 Mon Sep 17 00:00:00 2001 +From 829e5d3a505452fbdb420432dc885903332a8cdc Mon Sep 17 00:00:00 2001 From: Sughosh Ganu Date: Thu, 21 Sep 2023 14:15:13 +0100 -Subject: [PATCH 36/37] bootefi: Call the EVT_FT_FIXUP event handler +Subject: [PATCH 34/38] bootefi: Call the EVT_FT_FIXUP event handler The bootefi command passes the devicetree to the kernel through the EFI config table. Call the event handlers for fixing the devicetree diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-purge-U-Boot-specific-DT-nodes.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-corstone1000-purge-U-Boot-specific-DT-nodes.patch similarity index 92% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-purge-U-Boot-specific-DT-nodes.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-corstone1000-purge-U-Boot-specific-DT-nodes.patch index 2aafadd2..230ebe6e 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-purge-U-Boot-specific-DT-nodes.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0035-corstone1000-purge-U-Boot-specific-DT-nodes.patch @@ -1,7 +1,7 @@ -From 1527eef4dd54a425a5a178f09fa9d3d65aa3e30a Mon Sep 17 00:00:00 2001 +From 3654cebe9449584aa94563b2252c267b926219c9 Mon Sep 17 00:00:00 2001 From: Abdellatif El Khlifi Date: Thu, 21 Sep 2023 15:24:34 +0100 -Subject: [PATCH 37/37] corstone1000: purge U-Boot specific DT nodes +Subject: [PATCH 35/38] corstone1000: purge U-Boot specific DT nodes Remove U-Boot specific DT nodes before passing the DT to Linux diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-add-signature-device-tree-overlay.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-corstone1000-add-signature-device-tree-overlay.patch similarity index 78% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-add-signature-device-tree-overlay.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-corstone1000-add-signature-device-tree-overlay.patch index 9d8c6a9e..04193a8f 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-add-signature-device-tree-overlay.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0036-corstone1000-add-signature-device-tree-overlay.patch @@ -1,7 +1,7 @@ -From 88cb6f5a91178903d4e306d8653b941f9727987b Mon Sep 17 00:00:00 2001 +From b6e69bd68c1e0171aa2acb78bec54da02defe129 Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Wed, 13 Sep 2023 13:20:15 +0100 -Subject: [PATCH] corstone1000: add signature device tree overlay +Subject: [PATCH 36/38] corstone1000: add signature device tree overlay Adds signature device tree overlay. @@ -12,7 +12,7 @@ Upstream-Status: Pending [Not submitted to upstream yet] 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/corstone1000.dtsi b/arch/arm/dts/corstone1000.dtsi -index 25a032b6b3..1c3ab2c315 100644 +index 1e0ec075e4..077673dd44 100644 --- a/arch/arm/dts/corstone1000.dtsi +++ b/arch/arm/dts/corstone1000.dtsi @@ -111,6 +111,10 @@ @@ -27,5 +27,5 @@ index 25a032b6b3..1c3ab2c315 100644 compatible = "simple-bus"; #address-cells = <1>; -- -2.17.1 +2.25.1 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-enable-authenticated-capsule-config.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-enable-authenticated-capsule-config.patch similarity index 84% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-enable-authenticated-capsule-config.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-enable-authenticated-capsule-config.patch index 761234e6..fe48ab16 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0039-corstone1000-enable-authenticated-capsule-config.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0037-corstone1000-enable-authenticated-capsule-config.patch @@ -1,7 +1,7 @@ -From 9b884d4f483474b99fcb4850197a1c8dde34147d Mon Sep 17 00:00:00 2001 +From 6a4d38a82755a8946ff8b79440550cae8032abed Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Wed, 13 Sep 2023 13:52:02 +0100 -Subject: [PATCH] corstone1000: enable authenticated capsule config +Subject: [PATCH 37/38] corstone1000: enable authenticated capsule config Enables authenticated capsule update config for corstone1000. @@ -24,5 +24,5 @@ index 5b0b2ac3bf..2de3f5d7b3 100644 CONFIG_FWU_MULTI_BANK_UPDATE=y # CONFIG_TOOLS_MKEFICAPSULE is not set -- -2.17.1 +2.25.1 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-corstone1000-introduce-EFI-authenticated-capsule-upd.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-introduce-EFI-authenticated-capsule-upd.patch similarity index 93% rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-corstone1000-introduce-EFI-authenticated-capsule-upd.patch rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-introduce-EFI-authenticated-capsule-upd.patch index f47dd8c1..6e268d43 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0040-corstone1000-introduce-EFI-authenticated-capsule-upd.patch +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/corstone1000/0038-corstone1000-introduce-EFI-authenticated-capsule-upd.patch @@ -1,7 +1,8 @@ -From b99a39c662b9be5f940b895efa8016f5567e1c1f Mon Sep 17 00:00:00 2001 +From 0d1975369f3c483b540818cec8a088ed35116bbb Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Wed, 13 Sep 2023 13:55:08 +0100 -Subject: [PATCH] corstone1000: introduce EFI authenticated capsule update +Subject: [PATCH 38/38] corstone1000: introduce EFI authenticated capsule + update Introduces EFI authenticated capsule update for corstone1000. Corstone1000 implements platform-specific capsule update mechanism in u-bootdue to the SoC @@ -15,7 +16,7 @@ Upstream-Status: Inappropriate [Redesign of Capsule update interface is required 1 file changed, 39 insertions(+) diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c -index 6a06605ad9..30fb7d1dd5 100644 +index 6a06605ad9..e1c78d8c1c 100644 --- a/lib/efi_loader/efi_capsule.c +++ b/lib/efi_loader/efi_capsule.c @@ -820,6 +820,12 @@ efi_status_t __efi_runtime EFIAPI efi_update_capsule( @@ -72,5 +73,5 @@ index 6a06605ad9..30fb7d1dd5 100644 efi_memcpy_runtime(corstone1000_capsule_buf, capsule, capsule->capsule_image_size); -- -2.17.1 +2.25.1 diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend index c2916a55..4989ff61 100644 --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend @@ -29,28 +29,26 @@ SRC_URI:append:corstone1000 = " \ file://0016-efi_loader-fix-null-pointer-exception-with-get_image.patch \ file://0017-arm-corstone1000-add-mmc-for-fvp.patch \ file://0018-corstone1000-add-compressed-kernel-support.patch \ - file://0019-Introduce-external-sys-driver-to-device-tree.patch \ - file://0020-Add-mhu-and-rpmsg-client-to-u-boot-device-tree.patch \ - file://0021-arm-corstone1000-esrt-support.patch \ - file://0022-corstone1000-enable-distro-booting-command.patch \ - file://0023-corstone1000-add-fwu-metadata-store-info.patch \ - file://0024-fwu_metadata-make-sure-structures-are-packed.patch \ - file://0025-corstone1000-add-boot-index.patch \ - file://0026-corstone1000-adjust-boot-bank-and-kernel-location.patch \ - file://0027-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch \ - file://0028-nvmxip-move-header-to-include.patch \ - file://0029-corstone1000-set-kernel_addr-based-on-boot_idx.patch \ - file://0030-corstone1000-boot-index-from-active.patch \ - file://0031-corstone1000-enable-PSCI-reset.patch \ - file://0032-Enable-EFI-set-get-time-services.patch \ - file://0033-corstone1000-detect-inflated-kernel-size.patch \ - file://0034-corstone1000-ESRT-add-unique-firmware-GUID.patch \ - file://0035-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch \ - file://0036-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch \ - file://0037-corstone1000-purge-U-Boot-specific-DT-nodes.patch \ - file://0038-corstone1000-add-signature-device-tree-overlay.patch \ - file://0039-corstone1000-enable-authenticated-capsule-config.patch \ - file://0040-corstone1000-introduce-EFI-authenticated-capsule-upd.patch \ + file://0019-arm-corstone1000-esrt-support.patch \ + file://0020-corstone1000-enable-distro-booting-command.patch \ + file://0021-corstone1000-add-fwu-metadata-store-info.patch \ + file://0022-fwu_metadata-make-sure-structures-are-packed.patch \ + file://0023-corstone1000-add-boot-index.patch \ + file://0024-corstone1000-adjust-boot-bank-and-kernel-location.patch \ + file://0025-corstone1000-add-nvmxip-fwu-mdata-and-gpt-options.patch \ + file://0026-nvmxip-move-header-to-include.patch \ + file://0027-corstone1000-set-kernel_addr-based-on-boot_idx.patch \ + file://0028-corstone1000-boot-index-from-active.patch \ + file://0029-corstone1000-enable-PSCI-reset.patch \ + file://0030-Enable-EFI-set-get-time-services.patch \ + file://0031-corstone1000-detect-inflated-kernel-size.patch \ + file://0032-corstone1000-ESRT-add-unique-firmware-GUID.patch \ + file://0033-dt-Provide-a-way-to-remove-non-compliant-nodes-and-p.patch \ + file://0034-bootefi-Call-the-EVT_FT_FIXUP-event-handler.patch \ + file://0035-corstone1000-purge-U-Boot-specific-DT-nodes.patch \ + file://0036-corstone1000-add-signature-device-tree-overlay.patch \ + file://0037-corstone1000-enable-authenticated-capsule-config.patch \ + file://0038-corstone1000-introduce-EFI-authenticated-capsule-upd.patch \ " do_configure:append:corstone1000(){ From patchwork Tue Oct 17 07:57:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: harsimransingh.tungal@arm.com X-Patchwork-Id: 32433 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 E2E6DCDB482 for ; Tue, 17 Oct 2023 07:58:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.202548.1697529508034949143 for ; Tue, 17 Oct 2023 00:58:28 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 1EBFA2F4; Tue, 17 Oct 2023 00:59:08 -0700 (PDT) Received: from e132995.cambridge.arm.com (e132995.arm.com [10.1.37.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 80A0E3F762; Tue, 17 Oct 2023 00:58:26 -0700 (PDT) From: harsimransingh.tungal@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Harsimran Singh Tungal Subject: [PATCH 2/4] arm-bsp/linux: corstone1000: update the defconfig Date: Tue, 17 Oct 2023 08:57:46 +0100 Message-Id: <20231017075748.40743-3-harsimransingh.tungal@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231017075748.40743-1-harsimransingh.tungal@arm.com> References: <20231017075748.40743-1-harsimransingh.tungal@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Oct 2023 07:58:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5126 From: Harsimran Singh Tungal the configuration options corresponding to external system are removed from the kernel and the defconfig is generated with with savedefconfig bitbake task --- .../linux/files/corstone1000/defconfig | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig index f6e6409c..8abcaed4 100644 --- a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig +++ b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig @@ -8,15 +8,9 @@ CONFIG_RELAY=y CONFIG_BOOT_CONFIG=y CONFIG_ARCH_VEXPRESS=y CONFIG_CMDLINE="console=ttyAMA0 loglevel=9" -CONFIG_EFI=y # CONFIG_SUSPEND is not set -CONFIG_EFI_BOOTLOADER_CONTROL=y -CONFIG_EFI_CAPSULE_LOADER=y -CONFIG_EFI_TEST=y -CONFIG_RESET_ATTACK_MITIGATION=y # CONFIG_STACKPROTECTOR is not set CONFIG_MODULES=y -# CONFIG_BLK_DEV_BSG is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_NET=y CONFIG_PACKET=y @@ -28,8 +22,13 @@ CONFIG_IP_PNP_BOOTP=y CONFIG_SYN_COOKIES=y CONFIG_NET_SCHED=y CONFIG_DEVTMPFS=y +CONFIG_EFI_BOOTLOADER_CONTROL=y +CONFIG_EFI_CAPSULE_LOADER=y +CONFIG_EFI_TEST=y +CONFIG_RESET_ATTACK_MITIGATION=y CONFIG_SCSI=y CONFIG_BLK_DEV_SD=y +# CONFIG_BLK_DEV_BSG is not set CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_ALACRITECH is not set # CONFIG_NET_VENDOR_AMAZON is not set @@ -49,9 +48,9 @@ CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_MICREL is not set # CONFIG_NET_VENDOR_MICROCHIP is not set # CONFIG_NET_VENDOR_MICROSEMI is not set +# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_NATSEMI is not set # CONFIG_NET_VENDOR_NETRONOME is not set -# CONFIG_NET_VENDOR_NI is not set # CONFIG_NET_VENDOR_PENSANDO is not set # CONFIG_NET_VENDOR_QUALCOMM is not set # CONFIG_NET_VENDOR_RENESAS is not set @@ -90,11 +89,3 @@ CONFIG_LIBCRC32C=y # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_DEBUG_FS=y CONFIG_PANIC_TIMEOUT=5 -CONFIG_STACKTRACE=y -CONFIG_EXTSYS_CTRL=y -CONFIG_MAILBOX=y -CONFIG_ARM_MHU_V2=y -CONFIG_RPMSG=y -CONFIG_RPMSG_CHAR=y -CONFIG_RPMSG_ARM=y -CONFIG_RPMSG_CTRL=y From patchwork Tue Oct 17 07:57:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: harsimransingh.tungal@arm.com X-Patchwork-Id: 32432 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 D3EF4C41513 for ; Tue, 17 Oct 2023 07:58:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.202549.1697529510151740249 for ; Tue, 17 Oct 2023 00:58:30 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 A179B1007; Tue, 17 Oct 2023 00:59:09 -0700 (PDT) Received: from e132995.cambridge.arm.com (e132995.arm.com [10.1.37.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0F4FD3F762; Tue, 17 Oct 2023 00:58:27 -0700 (PDT) From: harsimransingh.tungal@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Harsimran Singh Tungal Subject: [PATCH 3/4] arm-bsp/linux: corstone1000: Remove External system patches Date: Tue, 17 Oct 2023 08:57:47 +0100 Message-Id: <20231017075748.40743-4-harsimransingh.tungal@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231017075748.40743-1-harsimransingh.tungal@arm.com> References: <20231017075748.40743-1-harsimransingh.tungal@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Oct 2023 07:58:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5127 From: Harsimran Singh Tungal remove the External system patches as they are not upstreamable. --- .../0002-Add-external-system-driver.patch | 220 ------------------ ...ds-workaround-for-cs1k-specific-bug.patch} | 0 ...03-Add-rpmsg-driver-for-corstone1000.patch | 218 ----------------- .../0004-rpmsg-arm-fix-return-value.patch | 30 --- ...pdate-chrdev-to-ctrldev-registration.patch | 28 --- .../linux/linux-arm-platforms.inc | 6 +- 6 files changed, 1 insertion(+), 501 deletions(-) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch rename meta-arm-bsp/recipes-kernel/linux/files/corstone1000/{0006-Adds-workaround-for-cs1k-specific-bug.patch => 0002-Adds-workaround-for-cs1k-specific-bug.patch} (100%) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0003-Add-rpmsg-driver-for-corstone1000.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0004-rpmsg-arm-fix-return-value.patch delete mode 100644 meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0005-rpmsg-arm-update-chrdev-to-ctrldev-registration.patch diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch deleted file mode 100644 index d8d9488b..00000000 --- a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Add-external-system-driver.patch +++ /dev/null @@ -1,220 +0,0 @@ -From 9eac502eacd36a4975ec34a3f076594fa4364032 Mon Sep 17 00:00:00 2001 -From: Emekcan -Date: Fri, 19 Aug 2022 14:51:08 +0100 -Subject: [PATCH] Add external system driver - -Adds external system driver to control it -from user-space. It provides run and reset -functionality at the moment. - -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Emekcan Aras -Signed-off-by: Rui Miguel Silva ---- - drivers/misc/Kconfig | 1 + - drivers/misc/Makefile | 1 + - drivers/misc/arm/Kconfig | 5 ++ - drivers/misc/arm/Makefile | 1 + - drivers/misc/arm/extsys_ctrl.c | 151 +++++++++++++++++++++++++++++++++ - 5 files changed, 159 insertions(+) - create mode 100644 drivers/misc/arm/Kconfig - create mode 100644 drivers/misc/arm/Makefile - create mode 100644 drivers/misc/arm/extsys_ctrl.c - -diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index 433aa4197785..912986abc46c 100644 ---- a/drivers/misc/Kconfig -+++ b/drivers/misc/Kconfig -@@ -555,4 +555,5 @@ source "drivers/misc/cardreader/Kconfig" - source "drivers/misc/uacce/Kconfig" - source "drivers/misc/pvpanic/Kconfig" - source "drivers/misc/mchp_pci1xxxx/Kconfig" -+source "drivers/misc/arm/Kconfig" - endmenu -diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile -index 56de43943cd5..22e6561b8192 100644 ---- a/drivers/misc/Makefile -+++ b/drivers/misc/Makefile -@@ -63,5 +63,6 @@ obj-$(CONFIG_HI6421V600_IRQ) += hi6421v600-irq.o - obj-$(CONFIG_OPEN_DICE) += open-dice.o - obj-$(CONFIG_GP_PCI1XXXX) += mchp_pci1xxxx/ - obj-$(CONFIG_VCPU_STALL_DETECTOR) += vcpu_stall_detector.o -+obj-y += arm/ - obj-$(CONFIG_TMR_MANAGER) += xilinx_tmr_manager.o - obj-$(CONFIG_TMR_INJECT) += xilinx_tmr_inject.o -diff --git a/drivers/misc/arm/Kconfig b/drivers/misc/arm/Kconfig -new file mode 100644 -index 000000000000..9f1eb284e530 ---- /dev/null -+++ b/drivers/misc/arm/Kconfig -@@ -0,0 +1,5 @@ -+config EXTSYS_CTRL -+ tristate "Arm External System control driver" -+ help -+ Say y here to enable support for external system control -+ driver for the Arm Corstone-700 and Corstone1000 platform -\ No newline at end of file -diff --git a/drivers/misc/arm/Makefile b/drivers/misc/arm/Makefile -new file mode 100644 -index 000000000000..1ca3084cf8a0 ---- /dev/null -+++ b/drivers/misc/arm/Makefile -@@ -0,0 +1 @@ -+obj-$(CONFIG_EXTSYS_CTRL) += extsys_ctrl.o -diff --git a/drivers/misc/arm/extsys_ctrl.c b/drivers/misc/arm/extsys_ctrl.c -new file mode 100644 -index 000000000000..7929070ff43d ---- /dev/null -+++ b/drivers/misc/arm/extsys_ctrl.c -@@ -0,0 +1,151 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * Arm Corstone700 and Corstone1000 external system reset control driver -+ * -+ * Copyright (C) 2019 Arm Ltd. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define EXTSYS_DRV_NAME "extsys_ctrl" -+#define EXTSYS_MAX_DEVS 4 -+ -+#define EXTSYS_RST_SIZE U(0x8) -+#define EXTSYS_RST_CTRL_OFF U(0x0) -+#define EXTSYS_RST_ST_OFF U(0x4) -+ -+/* External system reset control indexes */ -+#define EXTSYS_CPU_WAIT (0x0) -+#define EXTSYS_RST_REQ (0x1) -+ -+/* External system reset status masks */ -+#define EXTSYS_RST_ST_ACK_OFF U(0x1) -+ -+/* No Reset Requested */ -+#define EXTSYS_RST_ST_ACK_NRR (0x0 << EXTSYS_RST_ST_ACK_OFF) -+ -+/* Reset Request Complete */ -+#define EXTSYS_RST_ST_ACK_RRC (0x2 << EXTSYS_RST_ST_ACK_OFF) -+ -+/* Reset Request Unable to Complete */ -+#define EXTSYS_RST_ST_ACK_RRUC (0x3 << EXTSYS_RST_ST_ACK_OFF) -+ -+/* IOCTL commands */ -+#define EXTSYS_CPU_WAIT_DISABLE 0x0 -+#define EXTSYS_RESET_REQ_ENABLE 0x1 -+ -+struct extsys_ctrl { -+ struct miscdevice miscdev; -+ void __iomem *reset_reg; -+ void __iomem *set_reg; -+}; -+ -+#define CLEAR_BIT(addr, index) writel(readl(addr) & ~(1UL << index), addr) -+#define SET_BIT(addr, index) writel(readl(addr) | (1UL << index), addr) -+ -+static long extsys_ctrl_ioctl(struct file *f, unsigned int cmd, -+ unsigned long arg) -+{ -+ struct extsys_ctrl *extsys; -+ -+ extsys = container_of(f->private_data, struct extsys_ctrl, miscdev); -+ -+ switch (cmd) { -+ case EXTSYS_CPU_WAIT_DISABLE: -+ CLEAR_BIT(extsys->reset_reg, EXTSYS_CPU_WAIT); -+ break; -+ case EXTSYS_RESET_REQ_ENABLE: -+ SET_BIT(extsys->reset_reg, EXTSYS_RST_REQ); -+ break; -+ default: -+ break; -+ } -+ -+ return 0; -+} -+ -+static const struct file_operations extsys_ctrl_fops = { -+ .owner = THIS_MODULE, -+ .unlocked_ioctl = extsys_ctrl_ioctl, -+}; -+ -+static int extsys_ctrl_probe(struct platform_device *pdev) -+{ -+ struct device *dev = &pdev->dev; -+ struct extsys_ctrl *extsys; -+ struct resource *res; -+ void __iomem *reset_reg; -+ void __iomem *set_reg; -+ int ret; -+ -+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rstreg"); -+ reset_reg = devm_ioremap_resource(dev, res); -+ if (IS_ERR(reset_reg)) -+ return PTR_ERR(reset_reg); -+ -+ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "streg"); -+ set_reg = devm_ioremap_resource(dev, res); -+ if (IS_ERR(set_reg)) -+ return PTR_ERR(set_reg); -+ -+ extsys = devm_kzalloc(dev, sizeof(*extsys), GFP_KERNEL); -+ if (!extsys) -+ return -ENOMEM; -+ -+ extsys->reset_reg = reset_reg; -+ extsys->set_reg = set_reg; -+ -+ extsys->miscdev.minor = MISC_DYNAMIC_MINOR; -+ extsys->miscdev.name = EXTSYS_DRV_NAME; -+ extsys->miscdev.fops = &extsys_ctrl_fops; -+ extsys->miscdev.parent = dev; -+ -+ ret = misc_register(&extsys->miscdev); -+ if (ret) -+ return ret; -+ -+ dev_info(dev, "external system controller ready\n"); -+ -+ return 0; -+} -+ -+static int extsys_ctrl_remove(struct platform_device *pdev) -+{ -+ struct extsys_ctrl *extsys = dev_get_drvdata(&pdev->dev); -+ -+ misc_deregister(&extsys->miscdev); -+ -+ return 0; -+} -+ -+static const struct of_device_id extsys_ctrl_match[] = { -+ { .compatible = "arm,extsys_ctrl" }, -+ { }, -+}; -+MODULE_DEVICE_TABLE(of, extsys_ctrl_match); -+ -+static struct platform_driver extsys_ctrl_driver = { -+ .driver = { -+ .name = EXTSYS_DRV_NAME, -+ .of_match_table = extsys_ctrl_match, -+ }, -+ .probe = extsys_ctrl_probe, -+ .remove = extsys_ctrl_remove, -+}; -+module_platform_driver(extsys_ctrl_driver); -+ -+MODULE_LICENSE("GPL v2"); -+MODULE_DESCRIPTION("Arm External System Control Driver"); -+MODULE_AUTHOR("Morten Borup Petersen"); -+MODULE_AUTHOR("Rui Miguel Silva "); diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0006-Adds-workaround-for-cs1k-specific-bug.patch b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Adds-workaround-for-cs1k-specific-bug.patch similarity index 100% rename from meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0006-Adds-workaround-for-cs1k-specific-bug.patch rename to meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0002-Adds-workaround-for-cs1k-specific-bug.patch diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0003-Add-rpmsg-driver-for-corstone1000.patch b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0003-Add-rpmsg-driver-for-corstone1000.patch deleted file mode 100644 index cd9cec27..00000000 --- a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0003-Add-rpmsg-driver-for-corstone1000.patch +++ /dev/null @@ -1,218 +0,0 @@ -From a834f4e143ff647e7677dc60ab57ee5883f3ac8f Mon Sep 17 00:00:00 2001 -From: Emekcan -Date: Wed, 17 Aug 2022 14:21:42 +0100 -Subject: [PATCH] Add rpmsg driver for corstone1000 - -Adds rpmsg driver to communicate with external -system in corstone1000 platform. - -Upstream-Status: Pending -Signed-off-by: Emekcan Aras -Signed-off-by: Rui Miguel Silva ---- - drivers/rpmsg/Kconfig | 10 ++ - drivers/rpmsg/Makefile | 1 + - drivers/rpmsg/rpmsg_arm_mailbox.c | 164 ++++++++++++++++++++++++++++++ - 3 files changed, 175 insertions(+) - create mode 100644 drivers/rpmsg/rpmsg_arm_mailbox.c - -diff --git a/drivers/rpmsg/Kconfig b/drivers/rpmsg/Kconfig -index d3795860f5c0..fc6916d7b523 100644 ---- a/drivers/rpmsg/Kconfig -+++ b/drivers/rpmsg/Kconfig -@@ -81,4 +81,14 @@ config RPMSG_VIRTIO - select RPMSG_NS - select VIRTIO - -+config RPMSG_ARM -+ tristate "ARM RPMSG driver" -+ select RPMSG -+ depends on HAS_IOMEM -+ depends on MAILBOX -+ help -+ Say y here to enable support for rpmsg lient driver which is built -+ around mailbox client using Arm MHUv2.1 as physical medium.This -+ driver enables communication which remote processor using MHU. -+ - endmenu -diff --git a/drivers/rpmsg/Makefile b/drivers/rpmsg/Makefile -index 58e3b382e316..6bdcc69688b2 100644 ---- a/drivers/rpmsg/Makefile -+++ b/drivers/rpmsg/Makefile -@@ -1,5 +1,6 @@ - # SPDX-License-Identifier: GPL-2.0 - obj-$(CONFIG_RPMSG) += rpmsg_core.o -+obj-$(CONFIG_RPMSG_ARM) += rpmsg_arm_mailbox.o - obj-$(CONFIG_RPMSG_CHAR) += rpmsg_char.o - obj-$(CONFIG_RPMSG_CTRL) += rpmsg_ctrl.o - obj-$(CONFIG_RPMSG_NS) += rpmsg_ns.o -diff --git a/drivers/rpmsg/rpmsg_arm_mailbox.c b/drivers/rpmsg/rpmsg_arm_mailbox.c -new file mode 100644 -index 000000000000..4a80102669f6 ---- /dev/null -+++ b/drivers/rpmsg/rpmsg_arm_mailbox.c -@@ -0,0 +1,164 @@ -+// SPDX-License-Identifier: GPL-2.0 -+/* -+ * rpmsg client driver using mailbox client interface -+ * -+ * Copyright (C) 2019 ARM Ltd. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "rpmsg_internal.h" -+#include -+ -+#define RPMSG_NAME "arm_rpmsg" -+#define RPMSG_ADDR_ANY 0xFFFFFFFF -+ -+struct arm_channel { -+ struct rpmsg_endpoint ept; -+ struct mbox_client cl; -+ struct mbox_chan *mbox; -+}; -+ -+#define arm_channel_from_rpmsg(_ept) container_of(_ept, struct arm_channel, ept) -+#define arm_channel_from_mbox(_ept) container_of(_ept, struct arm_channel, cl) -+ -+ -+static void arm_msg_rx_handler(struct mbox_client *cl, void *mssg) -+{ -+ struct arm_mhuv2_mbox_msg *msg = mssg; -+ struct arm_channel* channel = arm_channel_from_mbox(cl); -+ int err = channel->ept.cb(channel->ept.rpdev, msg->data, 4, channel->ept.priv, RPMSG_ADDR_ANY); -+ if(err) { -+ printk("ARM Mailbox: Endpoint callback failed with error: %d", err); -+ } -+} -+ -+ -+static void arm_destroy_ept(struct rpmsg_endpoint *ept) -+{ -+ struct arm_channel *channel = arm_channel_from_rpmsg(ept); -+ mbox_free_channel(channel->mbox); -+ kfree(channel); -+} -+ -+static int arm_send(struct rpmsg_endpoint *ept, void *data, int len) -+{ -+ struct arm_channel *channel = arm_channel_from_rpmsg(ept); -+ -+ mbox_send_message(channel->mbox, data); -+ return 0; -+} -+ -+static int arm_sendto(struct rpmsg_endpoint *ept, void *data, int len, u32 dest) -+{ -+ struct arm_mhuv2_mbox_msg msg; -+ struct arm_channel *channel = arm_channel_from_rpmsg(ept); -+ msg.data = data; -+ msg.len = len; -+ mbox_send_message(channel->mbox, &msg); -+ return 0; -+} -+ -+ -+static const struct rpmsg_endpoint_ops arm_endpoint_ops = { -+ .destroy_ept = arm_destroy_ept, -+ .send = arm_send, -+ .sendto = arm_sendto, -+}; -+ -+ -+static struct rpmsg_endpoint *arm_create_ept(struct rpmsg_device *rpdev, -+ rpmsg_rx_cb_t cb, void *priv, struct rpmsg_channel_info chinfo) -+{ -+ struct arm_channel *channel; -+ -+ channel = kzalloc(sizeof(*channel), GFP_KERNEL); -+ -+ // Initialize rpmsg endpoint -+ kref_init(&channel->ept.refcount); -+ channel->ept.rpdev = rpdev; -+ channel->ept.cb = cb; -+ channel->ept.priv = priv; -+ channel->ept.ops = &arm_endpoint_ops; -+ -+ // Initialize mailbox client -+ channel->cl.dev = rpdev->dev.parent; -+ channel->cl.rx_callback = arm_msg_rx_handler; -+ channel->cl.tx_done = NULL; /* operate in blocking mode */ -+ channel->cl.tx_block = true; -+ channel->cl.tx_tout = 500; /* by half a second */ -+ channel->cl.knows_txdone = false; /* depending upon protocol */ -+ -+ channel->mbox = mbox_request_channel_byname(&channel->cl, chinfo.name); -+ if (IS_ERR_OR_NULL(channel->mbox)) { -+ printk("RPMsg ARM: Cannot get channel by name: '%s'\n", chinfo.name); -+ return -1; -+ } -+ -+ return &channel->ept; -+} -+ -+static const struct rpmsg_device_ops arm_device_ops = { -+ .create_ept = arm_create_ept, -+}; -+ -+ -+static void arm_release_device(struct device *dev) -+{ -+ struct rpmsg_device *rpdev = to_rpmsg_device(dev); -+ -+ kfree(rpdev); -+} -+ -+ -+static int client_probe(struct platform_device *pdev) -+{ -+ struct device *dev = &pdev->dev; -+ struct rpmsg_device *rpdev; -+ -+ rpdev = kzalloc(sizeof(*rpdev), GFP_KERNEL); -+ if (!rpdev) -+ return -ENOMEM; -+ -+ /* Assign callbacks for rpmsg_device */ -+ rpdev->ops = &arm_device_ops; -+ -+ /* Assign public information to the rpmsg_device */ -+ memcpy(rpdev->id.name, RPMSG_NAME, strlen(RPMSG_NAME)); -+ -+ rpdev->dev.parent = dev; -+ rpdev->dev.release = arm_release_device; -+ -+ return rpmsg_chrdev_register_device(rpdev); -+} -+ -+static const struct of_device_id client_of_match[] = { -+ { .compatible = "arm,client", .data = NULL }, -+ { /* Sentinel */ }, -+}; -+ -+static struct platform_driver client_driver = { -+ .driver = { -+ .name = "arm-mhu-client", -+ .of_match_table = client_of_match, -+ }, -+ .probe = client_probe, -+}; -+ -+module_platform_driver(client_driver); -+ -+MODULE_LICENSE("GPL v2"); -+MODULE_DESCRIPTION("ARM RPMSG Driver"); -+MODULE_AUTHOR("Tushar Khandelwal "); diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0004-rpmsg-arm-fix-return-value.patch b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0004-rpmsg-arm-fix-return-value.patch deleted file mode 100644 index 516dbd70..00000000 --- a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0004-rpmsg-arm-fix-return-value.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c1ffd793062a13afdcc07d4bc1a8007188bfca5f Mon Sep 17 00:00:00 2001 -From: Rui Miguel Silva -Date: Tue, 27 Sep 2022 10:05:27 +0100 -Subject: [PATCH] rpmsg: arm: fix return value - -The creation of and endpoint returns a pointer, fix the return -value to the right type. - -Upstream-Status: Pending -Signed-off-by: Rui Miguel Silva ---- - drivers/rpmsg/rpmsg_arm_mailbox.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/drivers/rpmsg/rpmsg_arm_mailbox.c b/drivers/rpmsg/rpmsg_arm_mailbox.c -index 4a80102669f6..5c0dcc8e353d 100644 ---- a/drivers/rpmsg/rpmsg_arm_mailbox.c -+++ b/drivers/rpmsg/rpmsg_arm_mailbox.c -@@ -103,8 +103,9 @@ static struct rpmsg_endpoint *arm_create_ept(struct rpmsg_device *rpdev, - - channel->mbox = mbox_request_channel_byname(&channel->cl, chinfo.name); - if (IS_ERR_OR_NULL(channel->mbox)) { -- printk("RPMsg ARM: Cannot get channel by name: '%s'\n", chinfo.name); -- return -1; -+ printk("RPMsg ARM: Cannot get channel by name: %s\n", -+ chinfo.name); -+ return ERR_PTR(-ENOENT); - } - - return &channel->ept; diff --git a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0005-rpmsg-arm-update-chrdev-to-ctrldev-registration.patch b/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0005-rpmsg-arm-update-chrdev-to-ctrldev-registration.patch deleted file mode 100644 index ef2eb7c1..00000000 --- a/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/0005-rpmsg-arm-update-chrdev-to-ctrldev-registration.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a8c295e1ff1d2b1032cc7495f212c56ba9f3e874 Mon Sep 17 00:00:00 2001 -From: Rui Miguel Silva -Date: Tue, 27 Sep 2022 10:07:21 +0100 -Subject: [PATCH] rpmsg: arm: update chrdev to ctrldev registration - -Since "rpmsg: Update rpmsg_chrdev_register_device function", -there was a replacement of the chrdev driver to ctrldev -driver. Fix the registration. - -Upstream-Status: Pending -Signed-off-by: Rui Miguel Silva ---- - drivers/rpmsg/rpmsg_arm_mailbox.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/rpmsg/rpmsg_arm_mailbox.c b/drivers/rpmsg/rpmsg_arm_mailbox.c -index 5c0dcc8e353d..90bc8df90885 100644 ---- a/drivers/rpmsg/rpmsg_arm_mailbox.c -+++ b/drivers/rpmsg/rpmsg_arm_mailbox.c -@@ -142,7 +142,7 @@ static int client_probe(struct platform_device *pdev) - rpdev->dev.parent = dev; - rpdev->dev.release = arm_release_device; - -- return rpmsg_chrdev_register_device(rpdev); -+ return rpmsg_ctrldev_register_device(rpdev); - } - - static const struct of_device_id client_of_match[] = { diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc index 4028cf31..4badfa8c 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc +++ b/meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc @@ -30,11 +30,7 @@ LINUX_KERNEL_TYPE:corstone1000 = "standard" KERNEL_EXTRA_ARGS:corstone1000 += "CONFIG_INITRAMFS_COMPRESSION_NONE=y" SRC_URI:append:corstone1000 = " \ file://defconfig \ - file://0002-Add-external-system-driver.patch \ - file://0003-Add-rpmsg-driver-for-corstone1000.patch \ - file://0004-rpmsg-arm-fix-return-value.patch \ - file://0005-rpmsg-arm-update-chrdev-to-ctrldev-registration.patch \ - file://0006-Adds-workaround-for-cs1k-specific-bug.patch \ + file://0002-Adds-workaround-for-cs1k-specific-bug.patch \ " SRC_URI:append:corstone1000 = " ${@bb.utils.contains('MACHINE_FEATURES', \ From patchwork Tue Oct 17 07:57:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: harsimransingh.tungal@arm.com X-Patchwork-Id: 32431 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 C3D3FCDB474 for ; Tue, 17 Oct 2023 07:58:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.202550.1697529510823959946 for ; Tue, 17 Oct 2023 00:58:30 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); 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 DBAC42F4; Tue, 17 Oct 2023 00:59:10 -0700 (PDT) Received: from e132995.cambridge.arm.com (e132995.arm.com [10.1.37.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 797B33F762; Tue, 17 Oct 2023 00:58:29 -0700 (PDT) From: harsimransingh.tungal@arm.com To: meta-arm@lists.yoctoproject.org, Ross.Burton@arm.com Cc: nd@arm.com, Harsimran Singh Tungal Subject: [PATCH 4/4] arm-bsp/images: corstone1000: Remove the external system test package Date: Tue, 17 Oct 2023 08:57:48 +0100 Message-Id: <20231017075748.40743-5-harsimransingh.tungal@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231017075748.40743-1-harsimransingh.tungal@arm.com> References: <20231017075748.40743-1-harsimransingh.tungal@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 17 Oct 2023 07:58:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5128 From: Harsimran Singh Tungal Remove external system linux userspace test application --- .../recipes-bsp/images/corstone1000-initramfs-image.bb | 3 --- 1 file changed, 3 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb index 884d4b3b..cac3b73c 100644 --- a/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb +++ b/meta-arm-bsp/recipes-bsp/images/corstone1000-initramfs-image.bb @@ -21,8 +21,5 @@ IMAGE_FEATURES:remove = "package-management" # all optee packages IMAGE_INSTALL += "optee-client" -# external system linux userspace test application -IMAGE_INSTALL += "corstone1000-external-sys-tests" - # TS PSA API tests commands for crypto, its, ps and iat IMAGE_INSTALL += "packagegroup-ts-tests-psa"