From patchwork Tue Apr 30 16:03:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bence.balogh@arm.com X-Patchwork-Id: 42971 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33C8EC4345F for ; Tue, 30 Apr 2024 16:03:21 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.19685.1714492991945027790 for ; Tue, 30 Apr 2024 09:03:12 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: bence.balogh@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0A6FB339; Tue, 30 Apr 2024 09:03:38 -0700 (PDT) Received: from e126523.arm.com (unknown [10.57.32.147]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A778E3F73F; Tue, 30 Apr 2024 09:03:10 -0700 (PDT) From: bence.balogh@arm.com To: meta-arm@lists.yoctoproject.org Cc: Bence Balogh Subject: [PATCH 2/3] arm-bsp/trusted-firmware-m: remove OpenAMP and Libmetal Date: Tue, 30 Apr 2024 18:03:00 +0200 Message-Id: <20240430160301.802105-3-bence.balogh@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240430160301.802105-1-bence.balogh@arm.com> References: <20240430160301.802105-1-bence.balogh@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 30 Apr 2024 16:03:21 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5663 From: Bence Balogh Corstone-1000 no longer uses OpenAMP, and it was the only platform which needed this library. Signed-off-by: Bence Balogh --- ...are-m-disable-address-warnings-into.patch} | 0 ...modify-path-to-libmetal-version-file.patch | 27 ------------------- .../trusted-firmware-m-corstone1000.inc | 20 ++------------ 3 files changed, 2 insertions(+), 45 deletions(-) rename meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/{0002-arm-trusted-firmware-m-disable-address-warnings-into.patch => 0001-arm-trusted-firmware-m-disable-address-warnings-into.patch} (100%) delete mode 100644 meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-cmake-modify-path-to-libmetal-version-file.patch diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0002-arm-trusted-firmware-m-disable-address-warnings-into.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-arm-trusted-firmware-m-disable-address-warnings-into.patch similarity index 100% rename from meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0002-arm-trusted-firmware-m-disable-address-warnings-into.patch rename to meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-arm-trusted-firmware-m-disable-address-warnings-into.patch diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-cmake-modify-path-to-libmetal-version-file.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-cmake-modify-path-to-libmetal-version-file.patch deleted file mode 100644 index d53524ad..00000000 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/files/0001-cmake-modify-path-to-libmetal-version-file.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6b38b9990c4dab0cb8524506ef129d4f326f3800 Mon Sep 17 00:00:00 2001 -From: Jon Mason -Date: Thu, 14 Dec 2023 09:23:09 -0500 -Subject: [PATCH] cmake: modify path to libmetal version file - -Commit ad87802d6e01e97946de20b6c2fa28aed184ed20 changed how the -versioning is done and created a version file. Due to this change, -the VERSION file is not being found when building because the source dir -is pointing to tf-m. Modify to point where we want it. - -Upstream-Status: Inappropriate [Build workaround] - -Signed-off-by: Jon Mason ---- - cmake/options.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/options.cmake b/cmake/options.cmake -index a7b4ef8bdf03..a06009b6acc4 100644 ---- a/cmake/options.cmake -+++ b/cmake/options.cmake -@@ -1,4 +1,4 @@ --file(READ ${LIBMETAL_ROOT_DIR}/VERSION ver) -+file(READ ${LIBMETAL_ROOT_DIR}/../libmetal/VERSION ver) - - string(REGEX MATCH "VERSION_MAJOR = ([0-9]*)" _ ${ver}) - set(PROJECT_VERSION_MAJOR ${CMAKE_MATCH_1}) diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc index ed4710e5..2bd346bf 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-m/trusted-firmware-m-corstone1000.inc @@ -11,25 +11,9 @@ TFM_PLATFORM_IS_FVP ?= "FALSE" EXTRA_OECMAKE += "-DPLATFORM_IS_FVP=${TFM_PLATFORM_IS_FVP}" EXTRA_OECMAKE += "-DCC312_LEGACY_DRIVER_API_ENABLED=OFF" -# libmetal v2023.04.0 -LICENSE += "& BSD-3-Clause" -LIC_FILES_CHKSUM += "file://../libmetal/LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4" -SRC_URI += "git://github.com/OpenAMP/libmetal.git;protocol=https;branch=main;name=libmetal;destsuffix=git/libmetal \ - file://0001-cmake-modify-path-to-libmetal-version-file.patch;patchdir=../libmetal \ - file://0002-arm-trusted-firmware-m-disable-address-warnings-into.patch \ +SRC_URI += " \ + file://0001-arm-trusted-firmware-m-disable-address-warnings-into.patch \ " -SRCREV_libmetal = "28fa2351d6a8121ce6c1c2ac5ee43ce08d38dbae" -EXTRA_OECMAKE += "-DLIBMETAL_SRC_PATH=${S}/../libmetal -DLIBMETAL_BIN_PATH=${B}/libmetal-build" -# The configuration can fail if libmetal tries to generate the docs and the doxygen bin is found -EXTRA_OECMAKE += "-DWITH_DOC=False" - -# OpenAMP v2023.04.0 -LICENSE += "& BSD-2-Clause & BSD-3-Clause" -LIC_FILES_CHKSUM += "file://../openamp/LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505" -SRC_URI += "git://github.com/OpenAMP/open-amp.git;protocol=https;branch=main;name=openamp;destsuffix=git/openamp" -SRCREV_openamp = "accac4d3610cbb268f3c3fe3c31dc45dd4c4dd17" -EXTRA_OECMAKE += "-DLIBOPENAMP_SRC_PATH=${S}/../openamp -DLIBOPENAMP_BIN_PATH=${B}/libopenamp-build" - FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI:append:corstone1000 = " \