From patchwork Fri May 31 09:25:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44445 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 9616AC27C53 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-bc0c.mail.infomaniak.ch (smtp-bc0c.mail.infomaniak.ch [45.157.188.12]) by mx.groups.io with SMTP id smtpd.web11.7556.1717147546912776886 for ; Fri, 31 May 2024 02:25:47 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 45.157.188.12, mailfrom: foss+yocto@0leil.net) Received: from smtp-4-0001.mail.infomaniak.ch (smtp-4-0001.mail.infomaniak.ch [10.7.10.108]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHm935WdzqGF; Fri, 31 May 2024 11:25:45 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm917NvzWbW; Fri, 31 May 2024 11:25:45 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:17 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 10/16] bsp: u-boot: remove duplicate trusted-firmware-a dependency for SoCs with open DDR init MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-10-629586621c5d@cherry.de> References: <20240531-rk3588-family-v3-0-629586621c5d@cherry.de> In-Reply-To: <20240531-rk3588-family-v3-0-629586621c5d@cherry.de> To: yocto-patches@lists.yoctoproject.org Cc: Quentin Schulz X-Mailer: b4 0.13.0 X-Infomaniak-Routing: alpha 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 ; Fri, 31 May 2024 09:25:54 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/261 From: Quentin Schulz For SoCs with open DDR init in U-Boot, there's no need for anything but the BL31 from TF-A (maybe OP-TEE as well but that's off-topic) in U-Boot. This is already handled by the TFA_DEPENDS variable outside of this git context, so there's no need to duplicate it here. By keeping the rockchip-rkbin dependency in INIT_FIRMWARE_DEPENDS and use the PREFERRED_PROVIDER mechanism for selecting rockchip-rkbin as provider for trusted-firmware-a as passed to TFA_DEPENDS, we make explicit the dependency on two different pieces of software, though currently provided by the same recipe. The point being that this should prepare us and at the very least break the build if we forget, for when open BL31 TF-A (so coming from trusted-firmware-a recipe and not rockchip-rkbin) is released and we can have rockchip-rkbin provide only the DDR bin and upstream TF-A provide BL31 TF-A and still have a proper dependency scheme. Signed-off-by: Quentin Schulz --- recipes-bsp/u-boot/u-boot_%.bbappend | 3 --- 1 file changed, 3 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index b4664d9..60f93a4 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -22,10 +22,7 @@ EXTRA_OEMAKE:append:rk3568 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3568.bin" EXTRA_OEMAKE:append:rk3588s = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin" INIT_FIRMWARE_DEPENDS ??= "" -INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy" INIT_FIRMWARE_DEPENDS:rk3308 = " rockchip-rkbin:do_deploy" -INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" -INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" INIT_FIRMWARE_DEPENDS:rk3568 = " rockchip-rkbin:do_deploy" INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}"