From 0d7a224a11a25dc35c571f473393e4a78b1510f6 Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 30 Jan 2024 13:17:41 +0000 Subject: [PATCH] bsp: Update Corstone-1000 firmware settings Since K3s is not supported for Corstone-1000 and it is been separated as a cloud-service feature for the Cassini distro in the meta-cassini repository, which can be included by `k3s.yml`, the firmware configuration related to this feature doesn't need to be explicitly removed. Even if `k3s.yml` is forced to be built with Corstone-1000, the K3s feature will still be removed, which is defined in `corstone1000-mps3.yml` on meta-cassini repository. Further, the `PREFERRED_RPROVIDER` will be set to `no_cloud` for Corstone-1000. This relates to the merge request: https://gitlab.com/Linaro/cassini/meta-cassini/-/merge_requests/199 Signed-off-by: Vikas Katariya --- .../include/corstone1000-mps3-cassini-extra-settings.inc | 7 +------ qa-checks/cassini-bsp-dictionary | 2 ++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc index c824d3c..9f255e6 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 Arm Limited and/or its +# SPDX-FileCopyrightText: Copyright 2023-2024 Arm Limited and/or its # affiliates # # SPDX-License-Identifier: MIT @@ -18,10 +18,5 @@ GRUB_CFG_FILE:cassini ?= "${CASSINI_ARM_BSP_DYNAMIC_DIR}/wic/corstone1000-grub.c EFI_PROVIDER:cassini ?= "grub-efi" MACHINE_FEATURES:append:cassini = " efi" -# Due to performance limitations, K3S is not supported on this platform -DISTRO_FEATURES:remove = "k3s" -IMAGE_INSTALL:remove = "k3s-server k3s-integration-tests-ptest" -KERNEL_CLASSES:remove = "k3s_kernelcfg_check" - # Due to performance limitations, add wait-online helper IMAGE_INSTALL:append:cassini = " wait-online" diff --git a/qa-checks/cassini-bsp-dictionary b/qa-checks/cassini-bsp-dictionary index 6504924..a2264dd 100644 --- a/qa-checks/cassini-bsp-dictionary +++ b/qa-checks/cassini-bsp-dictionary @@ -48,6 +48,7 @@ nanbield nativesdk netbase networkd +no_cloud nooelint opkg optee @@ -57,6 +58,7 @@ ptable readlink requireinclude requirenotfound +RPROVIDER SAST SDHC sourceparams -- GitLab