From patchwork Thu Mar 30 16:38:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21949 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 C8F0FC77B6F for ; Thu, 30 Mar 2023 16:38:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.30667.1680194298679291541 for ; Thu, 30 Mar 2023 09:38:19 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 30F352F4; Thu, 30 Mar 2023 09:39:02 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 682983F6C4; Thu, 30 Mar 2023 09:38:17 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 1/6] arm-bsp/linux-yocto: Update N1SDP PCI quirk patch Date: Thu, 30 Mar 2023 17:38:10 +0100 Message-Id: <20230330163815.3677638-1-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 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 ; Thu, 30 Mar 2023 16:38:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4513 From: Adam Johnston Poky commit 9ef8cbcdfc85c3ce2ca52d8bee2ab6929f589383 updates the kernel to 6.1.20 which breaks the PCI quirk patch for the N1SDP. This change fixes it. Signed-off-by: Adam Johnston --- ...002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch index 7a5ab7a2..cb72ed0a 100644 --- a/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch +++ b/meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.1/n1sdp/0002-n1sdp-pci_quirk-add-acs-override-for-PCI-devices.patch @@ -150,9 +150,9 @@ index 285acc4aaccc..d6ebef1f30db 100644 * Some NVIDIA GPU devices do not work with bus reset, SBR needs to be * prevented for those affected devices. @@ -4980,6 +5081,7 @@ static const struct pci_dev_acs_enabled { - { PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs }, - /* Zhaoxin Root/Downstream Ports */ { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, + /* Wangxun nics */ + { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs }, + { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, { 0 } }; From patchwork Thu Mar 30 16:38:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21948 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 BA04DC77B62 for ; Thu, 30 Mar 2023 16:38:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30538.1680194298900374787 for ; Thu, 30 Mar 2023 09:38:19 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 D0C951650; Thu, 30 Mar 2023 09:39:02 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 14EA73F6C4; Thu, 30 Mar 2023 09:38:17 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 2/6] arm/scp-firmware: fix up whitespace Date: Thu, 30 Mar 2023 17:38:11 +0100 Message-Id: <20230330163815.3677638-2-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330163815.3677638-1-ross.burton@arm.com> References: <20230330163815.3677638-1-ross.burton@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 ; Thu, 30 Mar 2023 16:38:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4512 For some reason the shell functions are indented an extra character, reindent to standard four spaces. Signed-off-by: Ross Burton --- .../scp-firmware/scp-firmware_2.10.0.bb | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb index b25b9a40..316de37c 100644 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb +++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb @@ -52,46 +52,46 @@ EXTRA_OECMAKE = "-D CMAKE_BUILD_TYPE=${SCP_BUILD_STR} \ " do_configure() { - for FW in ${FW_TARGETS}; do - for TYPE in ${FW_INSTALL}; do - cmake -GNinja ${EXTRA_OECMAKE} -S ${S} -B "${B}/${TYPE}/${FW}" -D SCP_FIRMWARE_SOURCE_DIR="${SCP_PLATFORM}/${FW}_${TYPE}" - done - done + for FW in ${FW_TARGETS}; do + for TYPE in ${FW_INSTALL}; do + cmake -GNinja ${EXTRA_OECMAKE} -S ${S} -B "${B}/${TYPE}/${FW}" -D SCP_FIRMWARE_SOURCE_DIR="${SCP_PLATFORM}/${FW}_${TYPE}" + done + done } do_configure[cleandirs] += "${B}" do_compile() { - for FW in ${FW_TARGETS}; do - for TYPE in ${FW_INSTALL}; do - cmake --build ${B}/${TYPE}/${FW} --target all - done - done + for FW in ${FW_TARGETS}; do + for TYPE in ${FW_INSTALL}; do + cmake --build ${B}/${TYPE}/${FW} --target all + done + done } do_install() { - install -d ${D}/firmware - for TYPE in ${FW_INSTALL}; do - for FW in ${FW_TARGETS}; do - if [ "$TYPE" = "romfw" ]; then - if [ "$FW" = "scp" ]; then - install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl1.bin" "${D}/firmware/${FW}_${TYPE}.bin" - install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl1" "${D}/firmware/${FW}_${TYPE}.elf" - elif [ "$FW" = "mcp" ]; then - install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl1.bin" "${D}/firmware/${FW}_${TYPE}.bin" - install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl1" "${D}/firmware/${FW}_${TYPE}.elf" - fi - elif [ "$TYPE" = "ramfw" ]; then - if [ "$FW" = "scp" ]; then - install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl2.bin" "${D}/firmware/${FW}_${TYPE}.bin" - install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl2" "${D}/firmware/${FW}_${TYPE}.elf" - elif [ "$FW" = "mcp" ]; then - install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl2.bin" "${D}/firmware/${FW}_${TYPE}.bin" - install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl2" "${D}/firmware/${FW}_${TYPE}.elf" - fi - fi - done - done + install -d ${D}/firmware + for TYPE in ${FW_INSTALL}; do + for FW in ${FW_TARGETS}; do + if [ "$TYPE" = "romfw" ]; then + if [ "$FW" = "scp" ]; then + install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl1.bin" "${D}/firmware/${FW}_${TYPE}.bin" + install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl1" "${D}/firmware/${FW}_${TYPE}.elf" + elif [ "$FW" = "mcp" ]; then + install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl1.bin" "${D}/firmware/${FW}_${TYPE}.bin" + install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl1" "${D}/firmware/${FW}_${TYPE}.elf" + fi + elif [ "$TYPE" = "ramfw" ]; then + if [ "$FW" = "scp" ]; then + install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl2.bin" "${D}/firmware/${FW}_${TYPE}.bin" + install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-bl2" "${D}/firmware/${FW}_${TYPE}.elf" + elif [ "$FW" = "mcp" ]; then + install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl2.bin" "${D}/firmware/${FW}_${TYPE}.bin" + install -D "${B}/${TYPE}/${FW}/bin/${SCP_PLATFORM}-mcp-bl2" "${D}/firmware/${FW}_${TYPE}.elf" + fi + fi + done + done } FILES:${PN} = "/firmware" From patchwork Thu Mar 30 16:38:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21946 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 C7D47C77B60 for ; Thu, 30 Mar 2023 16:38:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30539.1680194299721182232 for ; Thu, 30 Mar 2023 09:38:19 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 85D8B1682; Thu, 30 Mar 2023 09:39:03 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B58103F6C4; Thu, 30 Mar 2023 09:38:18 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 3/6] arm/scp-firmware: enable verbose builds Date: Thu, 30 Mar 2023 17:38:12 +0100 Message-Id: <20230330163815.3677638-3-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330163815.3677638-1-ross.burton@arm.com> References: <20230330163815.3677638-1-ross.burton@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 ; Thu, 30 Mar 2023 16:38:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4514 We want compile logs to be useful, so enable verbose logs to show what commands are being invoked. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb index 316de37c..ec5083eb 100644 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb +++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb @@ -64,7 +64,7 @@ do_configure[cleandirs] += "${B}" do_compile() { for FW in ${FW_TARGETS}; do for TYPE in ${FW_INSTALL}; do - cmake --build ${B}/${TYPE}/${FW} --target all + VERBOSE=1 cmake --build ${B}/${TYPE}/${FW} --target all done done } From patchwork Thu Mar 30 16:38:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21947 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 C8403C77B6E for ; Thu, 30 Mar 2023 16:38:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30540.1680194300207057631 for ; Thu, 30 Mar 2023 09:38:20 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 3BB082F4; Thu, 30 Mar 2023 09:39:04 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 6AB013F6C4; Thu, 30 Mar 2023 09:38:19 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 4/6] arm/scp-firmware: remove textrel from INSANE_SKIP Date: Thu, 30 Mar 2023 17:38:13 +0100 Message-Id: <20230330163815.3677638-4-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330163815.3677638-1-ross.burton@arm.com> References: <20230330163815.3677638-1-ross.burton@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 ; Thu, 30 Mar 2023 16:38:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4515 The text relocations appear to have been fixed and this skip is no longer needed. Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb index ec5083eb..a1662d58 100644 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb +++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb @@ -98,8 +98,8 @@ FILES:${PN} = "/firmware" SYSROOT_DIRS += "/firmware" FILES:${PN}-dbg += "/firmware/*.elf" -# Skip QA check for relocations in .text of elf binaries -INSANE_SKIP:${PN}-dbg = "arch textrel" +# These binaries are specifically for 32-bit arm +INSANE_SKIP:${PN}-dbg += "arch" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" INHIBIT_PACKAGE_STRIP = "1" From patchwork Thu Mar 30 16:38:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21944 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 B86FDC6FD1D for ; Thu, 30 Mar 2023 16:38:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.30668.1680194300909721050 for ; Thu, 30 Mar 2023 09:38:21 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 DC5E41650; Thu, 30 Mar 2023 09:39:04 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 2087D3F6C4; Thu, 30 Mar 2023 09:38:20 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 5/6] arm/scp-firmware: improve debug packaging Date: Thu, 30 Mar 2023 17:38:14 +0100 Message-Id: <20230330163815.3677638-5-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330163815.3677638-1-ross.burton@arm.com> References: <20230330163815.3677638-1-ross.burton@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 ; Thu, 30 Mar 2023 16:38:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4516 Instead of a SCP_BUILD_RELEASE boolean, add CMAKE_BUILD_TYPE and default to RelWithDebInfo which gives us release (optimised) builds with debug symbols in the matching .elf files. To ensure that buildpaths don't leak into the debug symbols, pass the debug prefix maps via CFLAGS and ASMFLAGS. Signed-off-by: Ross Burton --- .../recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb index a1662d58..b9d0953a 100644 --- a/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb +++ b/meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.10.0.bb @@ -14,7 +14,7 @@ SRCREV = "673d014f3861ad81cc5ab06d2884a314a610799b" PROVIDES += "virtual/control-processor-firmware" -SCP_BUILD_RELEASE ?= "1" +CMAKE_BUILD_TYPE ?= "RelWithDebInfo" SCP_PLATFORM ?= "invalid" SCP_COMPILER ?= "arm-none-eabi" SCP_LOG_LEVEL ?= "WARN" @@ -29,8 +29,6 @@ DEPENDS = "virtual/arm-none-eabi-gcc-native \ # For now we only build with GCC, so stop meta-clang trying to get involved TOOLCHAIN = "gcc" -SCP_BUILD_STR = "${@bb.utils.contains('SCP_BUILD_RELEASE', '1', 'Release', 'Debug', d)}" - inherit deploy B = "${WORKDIR}/build" @@ -39,13 +37,16 @@ S = "${WORKDIR}/git" # Allow platform specific copying of only scp or both scp & mcp, default to both FW_TARGETS ?= "scp mcp" FW_INSTALL ?= "ramfw romfw" + PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_MACHINE ?= "invalid" +export CFLAGS = "${DEBUG_PREFIX_MAP}" +export ASMFLAGS = "${DEBUG_PREFIX_MAP}" + LDFLAGS[unexport] = "1" -CFLAGS[unexport] = "1" -EXTRA_OECMAKE = "-D CMAKE_BUILD_TYPE=${SCP_BUILD_STR} \ +EXTRA_OECMAKE = "-D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \ -D SCP_LOG_LEVEL=${SCP_LOG_LEVEL} \ -D SCP_PLATFORM_FEATURE_SET=${SCP_PLATFORM_FEATURE_SET} \ -D DISABLE_CPPCHECK=1 \ From patchwork Thu Mar 30 16:38:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 21945 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 B61F5C761A6 for ; Thu, 30 Mar 2023 16:38:22 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.30541.1680194301596777944 for ; Thu, 30 Mar 2023 09:38:21 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@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 917351650; Thu, 30 Mar 2023 09:39:05 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C12903F6C4; Thu, 30 Mar 2023 09:38:20 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Cc: nd@arm.com Subject: [PATCH 6/6] CI: mask poky's llvm if we're using clang Date: Thu, 30 Mar 2023 17:38:15 +0100 Message-Id: <20230330163815.3677638-6-ross.burton@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230330163815.3677638-1-ross.burton@arm.com> References: <20230330163815.3677638-1-ross.burton@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 ; Thu, 30 Mar 2023 16:38:22 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/4517 meta-clang's clang recipe has an irritating interaction with oe-core's llvm recipe which can result in build warnings, which cause builds to fail in our pedantic CI. The current best known workaround is to simply mask out the llvm recipes if clang is being used. For more details, see https://github.com/kraj/meta-clang/pull/766. Signed-off-by: Ross Burton --- ci/clang.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/clang.yml b/ci/clang.yml index 7559f6b0..eeee7852 100644 --- a/ci/clang.yml +++ b/ci/clang.yml @@ -8,3 +8,6 @@ repos: local_conf_header: toolchain: | TOOLCHAIN = "clang" + # This is needed to stop bitbake getting confused about what clang/llvm is + # being used, see https://github.com/kraj/meta-clang/pull/766 + BBMASK += "/meta/recipes-devtools/llvm/llvm.*\.bb"