From 80fde451896b2b8f0b881979444b7cb0574cce7d Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 4 Feb 2025 11:17:49 +0000 Subject: [PATCH 1/4] bsp: Add Mender support for Corstone-1000 FVP Mender Over-the-air update uses a `uefiimg` extension than `wic`, when it is added to Cassini distro. Therefore update the fvpconf file to support this. Signed-off-by: Vikas Katariya --- .dictionary | 5 ++++- .../include/corstone1000-fvp-cassini-extra-settings.inc | 8 +++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.dictionary b/.dictionary index cab48e1..f99448e 100644 --- a/.dictionary +++ b/.dictionary @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2025 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -39,6 +39,7 @@ FILESEXTRAPATHS flashfw fstype FSTYPES +fvpconf fvps gcsections gettext @@ -108,6 +109,7 @@ TF-A THISDIR TOTALIMAGES udev +uefiimg unitdir unpackdir upstreamed @@ -117,6 +119,7 @@ util utils VIRT wchar +wic WIDEC workdir XNVM diff --git a/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc b/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc index b384481..ef4268a 100644 --- a/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc +++ b/conf/machine/include/corstone1000-fvp-cassini-extra-settings.inc @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2025 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -8,3 +8,9 @@ include conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc # FVP parameters # Setup the second MMC card FVP_CONFIG[board.msd_mmc_2.diagnostics] ?= "0" + +IMAGE_EXTENSION = "${@bb.utils.contains('VIRTUAL-RUNTIME_ota_update', \ + 'mender-ota', \ + 'uefiimg', 'wic', d)}" + +FVP_CONFIG[board.msd_mmc.p_mmc_file] = "${IMAGE_NAME}.${IMAGE_EXTENSION}" -- GitLab From e6ba7e1db731a5f58d693780c43491e3d0e1cff6 Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 4 Feb 2025 17:55:31 +0000 Subject: [PATCH 2/4] ci: Remove EOL branches from CI trigger rules Signed-off-by: Vikas Katariya --- .gitlab-ci.yml | 5 ++--- .gitlab/ci/rules.yml | 8 +------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b9d5af..96c4857 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2025 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -13,8 +13,7 @@ variables: META_CASSINI_TARGET_BRANCH: value: none description: Comma separated list of meta-cassini branch to trigger - (none, main, scarthgap-dev, nanbield-dev, - mickledore-dev, kirkstone-dev) + (none, main, scarthgap-dev, kirkstone-dev) META_CASSINI_BUILD_IMAGE: value: all-images description: Comma separated list of images to build diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 8da67b0..4353d18 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2025 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -63,12 +63,6 @@ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "scarthgap"' variables: META_CASSINI_TARGET_BRANCH: 'scarthgap-dev' - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "nanbield"' - variables: - META_CASSINI_TARGET_BRANCH: 'nanbield-dev' - - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "mickledore"' - variables: - META_CASSINI_TARGET_BRANCH: 'mickledore-dev' - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "kirkstone"' variables: META_CASSINI_TARGET_BRANCH: 'kirkstone-dev' -- GitLab From d0dc1acfa6b3faf2f1c82a9da0334afd0e9a92dd Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 4 Feb 2025 17:59:36 +0000 Subject: [PATCH 3/4] ci: Add support for styhead Update rules and options for styhead branch. Signed-off-by: Vikas Katariya --- .gitlab-ci.yml | 3 ++- .gitlab/ci/rules.yml | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 96c4857..7680265 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,8 @@ variables: META_CASSINI_TARGET_BRANCH: value: none description: Comma separated list of meta-cassini branch to trigger - (none, main, scarthgap-dev, kirkstone-dev) + (none, main, styhead-dev, scarthgap-dev, + kirkstone-dev) META_CASSINI_BUILD_IMAGE: value: all-images description: Comma separated list of images to build diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 4353d18..bc7dd47 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -60,6 +60,9 @@ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main"' variables: META_CASSINI_TARGET_BRANCH: 'main' + - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "styhead"' + variables: + META_CASSINI_TARGET_BRANCH: 'styhead-dev' - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "scarthgap"' variables: META_CASSINI_TARGET_BRANCH: 'scarthgap-dev' -- GitLab From 1941dc970cc4fbf0f5eb6c43d31804ad41f77292 Mon Sep 17 00:00:00 2001 From: Emekcan Aras Date: Thu, 20 Feb 2025 11:50:51 +0000 Subject: [PATCH 4/4] bsp: Align Corstone-1000 image configuration with mender Aligns mender related configuration for Corstone-1000 platform. Additionally, Corstone-1000 capsule key and certificate files are already installed by u-boot recipe and mender build triggers firmware-deploy task again to copy these binaries which causes an issue. So this commits also removes capsule key and certification for Corstone-1000 for mender builds. Signed-off-by: Vikas Katariya Signed-off-by: Emekcan Aras --- .../corstone1000-mps3-cassini-extra-settings.inc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc index 4f7d52e..6f60063 100644 --- a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc +++ b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2025 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -9,3 +9,11 @@ IMAGE_INSTALL:append:cassini = " wait-online" # Since the host has two stage booting, we need to ensure we # only get a single ip address for the same MAC incase of reboot IMAGE_INSTALL:append:cassini = " send-no-hostname" + +# Mender configuration +INHERIT:remove:firmware = " ${@bb.utils.contains('VIRTUAL-RUNTIME_ota_update',\ + 'mender-ota', 'mender-maybe-setup', '',d)}" +MENDER_EFI_LOADER:firmware = "" +FIRMWARE_BINARIES:remove:pn-firmware-deploy-image = " ${@bb.utils.contains(\ + 'VIRTUAL-RUNTIME_ota_update', 'mender-ota', \ + ' corstone1000_capsule_cert.crt corstone1000_capsule_key.key', '',d)}" -- GitLab