From patchwork Thu Dec 9 13:20:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1066 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 B02CFC433F5 for ; Thu, 9 Dec 2021 13:20:35 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.11272.1639056035031457307 for ; Thu, 09 Dec 2021 05:20:35 -0800 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 B3050ED1 for ; Thu, 9 Dec 2021 05:20:33 -0800 (PST) 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 ESMTPSA id 5D4E03F5A1 for ; Thu, 9 Dec 2021 05:20:33 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/2] arm-bsp/scp-firmware: remove redundant SGI-575-specific do_install Date: Thu, 9 Dec 2021 13:20:30 +0000 Message-Id: <20211209132031.902428-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.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, 09 Dec 2021 13:20:35 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2577 The base recipe can install the required files, so this is redundant. Signed-off-by: Ross Burton --- .../recipes-bsp/scp-firmware/scp-firmware-sgi575.inc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc index 0a3d6112..e1b0a854 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-sgi575.inc @@ -4,10 +4,3 @@ SCP_PLATFORM = "sgi575" SCP_LOG_LEVEL = "INFO" COMPATIBLE_MACHINE:sgi575 = "sgi575" - -do_install() { - install -d ${D}/firmware - install -D "${B}/product/${SCP_PLATFORM}/scp_romfw/release/bin/scp_romfw.bin" "${D}/firmware/" - install -D "${B}/product/${SCP_PLATFORM}/scp_ramfw/release/bin/scp_ramfw.bin" "${D}/firmware/" - install -D "${B}/product/${SCP_PLATFORM}/mcp_romfw/release/bin/mcp_romfw.bin" "${D}/firmware/" -} From patchwork Thu Dec 9 13:20:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 1067 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 A3FBFC433EF for ; Thu, 9 Dec 2021 13:20:36 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web08.11255.1639056035982616055 for ; Thu, 09 Dec 2021 05:20:36 -0800 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 4487011B3 for ; Thu, 9 Dec 2021 05:20:34 -0800 (PST) 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 ESMTPSA id E3ECC3F5A1 for ; Thu, 9 Dec 2021 05:20:33 -0800 (PST) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 2/2] arm-bsp/scp-firmware: add comment to explain where a UUID is defined Date: Thu, 9 Dec 2021 13:20:31 +0000 Message-Id: <20211209132031.902428-2-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211209132031.902428-1-ross.burton@arm.com> References: <20211209132031.902428-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, 09 Dec 2021 13:20:36 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/2578 The N1SDP build uses a non-standard FIP UUID, so explain where it comes from. Signed-off-by: Ross Burton --- meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc index a1e2af61..0352539a 100644 --- a/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc +++ b/meta-arm-bsp/recipes-bsp/scp-firmware/scp-firmware-n1sdp.inc @@ -15,6 +15,7 @@ do_install:append() { --soc-fw "${RECIPE_SYSROOT}/firmware/bl31.bin" \ "scp_fw.bin" + # This UUID is FIP_UUID_MCP_BL2 in SCP-Firmware. fiptool \ create \ --blob uuid=54464222-a4cf-4bf8-b1b6-cee7dade539e,file="${D}/firmware/mcp_ramfw.bin" \