From 13601ec4d0bc5fd7111d71146fda7f83ff8ee754 Mon Sep 17 00:00:00 2001 From: Ali Can Ozaslan Date: Mon, 14 Apr 2025 12:50:48 +0000 Subject: [PATCH 1/2] bsp: Remove cassini-specific N1SDP machine settings The file is no longer needed as Cassini support for N1SDP is being removed. Signed-off-by: Ali Can Ozaslan --- .../machine/include/n1sdp-cassini-extra-settings.inc | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 conf/machine/include/n1sdp-cassini-extra-settings.inc diff --git a/conf/machine/include/n1sdp-cassini-extra-settings.inc b/conf/machine/include/n1sdp-cassini-extra-settings.inc deleted file mode 100644 index 4b286ed..0000000 --- a/conf/machine/include/n1sdp-cassini-extra-settings.inc +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its -# affiliates -# -# SPDX-License-Identifier: MIT - -# FFA driver -MACHINE_FEATURES:append = " arm-ffa" - -# Trusted services secure partitions -MACHINE_FEATURES:append = " ts-crypto ts-storage ts-its ts-attestation ts-block-storage" - -IMAGE_INSTALL:append:cassini-test = " optee-test optee-xtests-ptest" -- GitLab From 92dfb79a088f075a77d8be5e44eef4ab820ffaa3 Mon Sep 17 00:00:00 2001 From: Ali Can Ozaslan Date: Mon, 14 Apr 2025 12:20:28 +0000 Subject: [PATCH 2/2] bsp: Remove cassini-sdk feature references The cassini-sdk DISTRO_FEATURE is no longer used. Removed related checks and file references from corstone1000 recipes. Signed-off-by: Ali Can Ozaslan --- .dictionary | 2 ++ meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.dictionary b/.dictionary index d2d242c..78de646 100644 --- a/.dictionary +++ b/.dictionary @@ -16,6 +16,7 @@ bsp buildable BUILDIN cassini +cassini-sdk cgroups COMPAT config @@ -29,6 +30,7 @@ crypto DHCP dialout distro +DISTRO_FEATURE DISTROOVERRIDES efidisk eglibc diff --git a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend index 75f993c..0a12842 100644 --- a/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend +++ b/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-%.bbappend @@ -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 @@ -10,7 +10,4 @@ SRC_URI:append:cassini:corstone1000 = " \ file://cgroups.cfg \ file://container.cfg \ file://network.cfg \ - ${@bb.utils.contains('DISTRO_FEATURES', \ - 'cassini-sdk', \ - 'file://sdk.cfg', '', d)} \ " -- GitLab