diff --git a/conf/layer.conf b/conf/layer.conf index 7250e5d9107b2be9bc93c6a7eb85d09089253c0a..2e779befca0fb3e5c44c77d98e92f80dc8b98d95 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -1,5 +1,7 @@ -# Copyright (c) 2022-2023 Arm Limited and/or its affiliates. -# +# SPDX-FileCopyrightText: Copyright (c) 2023, Linaro Limited. +# +# SPDX-FileCopyrightText: Copyright 2022-2023 Arm Limited and/or its +# affiliates # # SPDX-License-Identifier: MIT @@ -16,7 +18,7 @@ BBFILES_DYNAMIC += " \ BBFILE_COLLECTIONS += "meta-cassini-bsp" BBFILE_PATTERN_meta-cassini-bsp = "^${LAYERDIR}/" -LAYERSERIES_COMPAT_meta-cassini-bsp = "mickledore" +LAYERSERIES_COMPAT_meta-cassini-bsp = "nanbield" # Root directory for the meta-cassini-bsp/meta-arm/meta-arm-bsp CASSINI_ARM_BSP_DYNAMIC_DIR := "${LAYERDIR}/meta-arm/meta-arm-bsp" diff --git a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc index e77caa53a214de1561b8541e27a02eeff8cd03bf..c824d3c35bf5fa08fd9c1666fe11a7856909a27e 100644 --- a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc +++ b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc @@ -24,4 +24,4 @@ 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-test = "wait-online" +IMAGE_INSTALL:append:cassini = " wait-online" diff --git a/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-its_%.bbappend b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-its_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..64215cd535558d89487082dec51ad188d34f6b48 --- /dev/null +++ b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-its_%.bbappend @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its +# affiliates +# +# SPDX-License-Identifier: MIT + +# Override configuration to use block storage service +OECMAKE_SOURCEPATH:n1sdp = "${S}/deployments/internal-trusted-storage/config/shared-flash-${TS_ENV}" diff --git a/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-storage_%.bbappend b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-storage_%.bbappend new file mode 100644 index 0000000000000000000000000000000000000000..2d3e9e98347456916688ed45bb42d4742d054e28 --- /dev/null +++ b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-storage_%.bbappend @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its +# affiliates +# +# SPDX-License-Identifier: MIT + +# Override configuration to use block storage service +OECMAKE_SOURCEPATH:n1sdp = "${S}/deployments/protected-storage/config/shared-flash-${TS_ENV}" diff --git a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_%.bbappend b/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_%.bbappend deleted file mode 100644 index 87b1dd174ccc254b55f49a9ae1ccaec74d655b3a..0000000000000000000000000000000000000000 --- a/meta-security/meta-parsec/recipes-parsec/parsec-service/parsec-service_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-FileCopyrightText: Copyright 2023 Arm Limited and/or its -# affiliates -# -# SPDX-License-Identifier: MIT - -FILESEXTRAPATHS:prepend := "${THISDIR}/files:" - -SRC_URI:append:cassini = " file://config-ts.toml" - -PARSEC_CONFIG:cassini = "${@bb.utils.contains('PACKAGECONFIG', 'TS', \ - '${WORKDIR}/config-ts.toml', '${S}/config.toml', d)}" -