From 19ca4deed1206ea66599c9f6fbd38a8cc8738033 Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 4 Feb 2025 11:17:49 +0000 Subject: [PATCH 1/3] 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 782d02d..5c68c4b 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 @@ -38,6 +38,7 @@ FILESEXTRAPATHS flashfw fstype FSTYPES +fvpconf fvps gcsections gettext @@ -105,6 +106,7 @@ TF-A THISDIR TOTALIMAGES udev +uefiimg unitdir unpackdir upstreamed @@ -114,6 +116,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 0d191d6564f191a314737701a4f9c0898773d445 Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 4 Feb 2025 17:55:31 +0000 Subject: [PATCH 2/3] 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 25b5778be2c6a4aa20f0409f96fe39b7eb7863c6 Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 4 Feb 2025 17:59:36 +0000 Subject: [PATCH 3/3] 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