From patchwork Fri May 31 09:25:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44444 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 7364DC41513 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-bc0b.mail.infomaniak.ch (smtp-bc0b.mail.infomaniak.ch [45.157.188.11]) by mx.groups.io with SMTP id smtpd.web11.7550.1717147543810921010 for ; Fri, 31 May 2024 02:25:44 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 45.157.188.11, 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-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHm62SdvzvLs; Fri, 31 May 2024 11:25:42 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm554HkzWVY; Fri, 31 May 2024 11:25:41 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:08 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 01/16] rk3588/rk3588s: add SOC_FAMILY MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-1-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/253 From: Quentin Schulz This adds an SOC_FAMILY for rk3588 and rk3588s. Note that we are NOT "require"'ing conf/machine/include/soc-family.inc so SOC_FAMILY is just another BitBake variable. If we were to require this file, it would break the MACHINEOVERRIDES order, so some more changes would be required to handle those properly. Signed-off-by: Quentin Schulz --- conf/machine/include/rk3588.inc | 1 + conf/machine/include/rk3588s.inc | 1 + 2 files changed, 2 insertions(+) diff --git a/conf/machine/include/rk3588.inc b/conf/machine/include/rk3588.inc index 34f0627..958efb2 100644 --- a/conf/machine/include/rk3588.inc +++ b/conf/machine/include/rk3588.inc @@ -1,4 +1,5 @@ MACHINEOVERRIDES =. "rk3588:" +SOC_FAMILY = "rk3588" # the rk3588s is a "stripped-down" version of the rk3588 # in the kernel's device-tree the rk3588 builds on top of the rk3588s diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc index 878f7a8..6e700d8 100644 --- a/conf/machine/include/rk3588s.inc +++ b/conf/machine/include/rk3588s.inc @@ -1,3 +1,4 @@ +SOC_FAMILY ?= "rk3588s" MACHINEOVERRIDES =. "rk3588s:" DEFAULTTUNE ?= "cortexa76-cortexa55-crypto" From patchwork Fri May 31 09:25:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44452 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 1A339C27C75 for ; Fri, 31 May 2024 09:25:55 +0000 (UTC) Received: from smtp-42ab.mail.infomaniak.ch (smtp-42ab.mail.infomaniak.ch [84.16.66.171]) by mx.groups.io with SMTP id smtpd.web10.7570.1717147543935575693 for ; Fri, 31 May 2024 02:25:44 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 84.16.66.171, 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-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHm64ZdPzq4h; Fri, 31 May 2024 11:25:42 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm62CtvzTs4; Fri, 31 May 2024 11:25:42 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:09 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 02/16] rk3066: fix MACHINEOVERRIDES order MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-2-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:55 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/252 From: Quentin Schulz The SOC_FAMILY OVERRIDES should come after the TUNE one, so it needs to be defined before. before: MACHINEOVERRIDES="rk3066:armv7a:marsboard-rk3066" after: MACHINEOVERRIDES="armv7a:rk3066:marsboard-rk3066" Signed-off-by: Quentin Schulz --- conf/machine/include/rk3066.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc index 3510df2..a2685af 100644 --- a/conf/machine/include/rk3066.inc +++ b/conf/machine/include/rk3066.inc @@ -3,8 +3,8 @@ SOC_FAMILY = "rk3066" -require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/soc-family.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/rockchip-defaults.inc SERIAL_CONSOLES = "115200;ttyS2" From patchwork Fri May 31 09:25:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44453 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 BE3E8C27C65 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-8faf.mail.infomaniak.ch (smtp-8faf.mail.infomaniak.ch [83.166.143.175]) by mx.groups.io with SMTP id smtpd.web10.7571.1717147544430224485 for ; Fri, 31 May 2024 02:25:44 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 83.166.143.175, 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-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHm66wrrzqm2; Fri, 31 May 2024 11:25:42 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm64TGrzVC0; Fri, 31 May 2024 11:25:42 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:10 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 03/16] rk3188: fix MACHINEOVERRIDES order MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-3-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/254 From: Quentin Schulz The SOC_FAMILY OVERRIDES should come after the TUNE one, so it needs to be defined before. before: MACHINEOVERRIDES="rk3188:armv7a:radxarock" after: MACHINEOVERRIDES="armv7a:rk3188:radxarock" Signed-off-by: Quentin Schulz --- conf/machine/include/rk3188.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc index 830f908..c85710d 100644 --- a/conf/machine/include/rk3188.inc +++ b/conf/machine/include/rk3188.inc @@ -3,8 +3,8 @@ SOC_FAMILY = "rk3188" -require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/soc-family.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/rockchip-defaults.inc SERIAL_CONSOLES = "115200;ttyFIQ0" From patchwork Fri May 31 09:25:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44455 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 C981EC27C5F for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-190e.mail.infomaniak.ch (smtp-190e.mail.infomaniak.ch [185.125.25.14]) by mx.groups.io with SMTP id smtpd.web10.7572.1717147545008050821 for ; Fri, 31 May 2024 02:25:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 185.125.25.14, 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 4VrHm72557zpF4; Fri, 31 May 2024 11:25:43 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm66hLDzTlw; Fri, 31 May 2024 11:25:42 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:11 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 04/16] rk3288: fix MACHINEOVERRIDES order MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-4-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/255 From: Quentin Schulz The SOC_FAMILY OVERRIDES should come after the TUNE one, so it needs to be defined before. before: MACHINEOVERRIDES="rk3288:armv7ve:vyasa-rk3288" after: MACHINEOVERRIDES="armv7ve:rk3288:vyasa-rk3288" Signed-off-by: Quentin Schulz --- conf/machine/include/rk3288.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index e682c0b..e0dbd6c 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -3,8 +3,8 @@ SOC_FAMILY = "rk3288" -require conf/machine/include/arm/armv7a/tune-cortexa17.inc require conf/machine/include/soc-family.inc +require conf/machine/include/arm/armv7a/tune-cortexa17.inc require conf/machine/include/rockchip-defaults.inc SERIAL_CONSOLES = "115200;ttyS2" From patchwork Fri May 31 09:25:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44456 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 08417C27C6D for ; Fri, 31 May 2024 09:25:55 +0000 (UTC) Received: from smtp-42ae.mail.infomaniak.ch (smtp-42ae.mail.infomaniak.ch [84.16.66.174]) by mx.groups.io with SMTP id smtpd.web11.7551.1717147544919448731 for ; Fri, 31 May 2024 02:25:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 84.16.66.174, 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 4VrHm73YLtzlC6; Fri, 31 May 2024 11:25:43 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm71QHPzTGg; Fri, 31 May 2024 11:25:43 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:12 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 05/16] add rockchip MACHINEOVERRIDES MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-5-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:55 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/256 From: Quentin Schulz Add "rockchip" to the MACHINEOVERRIDES so that it can be used to easily identify things that apply only to Rockchip-based devices and keeping other devices untouched. Signed-off-by: Quentin Schulz --- conf/machine/include/px30.inc | 2 +- conf/machine/include/rk3066.inc | 2 +- conf/machine/include/rk3188.inc | 2 +- conf/machine/include/rk3288.inc | 2 +- conf/machine/include/rk3308.inc | 2 +- conf/machine/include/rk3328.inc | 2 +- conf/machine/include/rk3399.inc | 2 +- conf/machine/include/rk3568.inc | 2 +- conf/machine/include/rk3588s.inc | 2 +- conf/machine/include/rockchip-defaults.inc | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/conf/machine/include/px30.inc b/conf/machine/include/px30.inc index badcbcd..d78409e 100644 --- a/conf/machine/include/px30.inc +++ b/conf/machine/include/px30.inc @@ -6,8 +6,8 @@ SOC_FAMILY = "px30" DEFAULTTUNE ?= "cortexa35-crypto" require conf/machine/include/soc-family.inc -require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" diff --git a/conf/machine/include/rk3066.inc b/conf/machine/include/rk3066.inc index a2685af..026d5b5 100644 --- a/conf/machine/include/rk3066.inc +++ b/conf/machine/include/rk3066.inc @@ -4,8 +4,8 @@ SOC_FAMILY = "rk3066" require conf/machine/include/soc-family.inc -require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyS2" diff --git a/conf/machine/include/rk3188.inc b/conf/machine/include/rk3188.inc index c85710d..0120e2f 100644 --- a/conf/machine/include/rk3188.inc +++ b/conf/machine/include/rk3188.inc @@ -4,8 +4,8 @@ SOC_FAMILY = "rk3188" require conf/machine/include/soc-family.inc -require conf/machine/include/arm/armv7a/tune-cortexa9.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv7a/tune-cortexa9.inc SERIAL_CONSOLES = "115200;ttyFIQ0" diff --git a/conf/machine/include/rk3288.inc b/conf/machine/include/rk3288.inc index e0dbd6c..684e864 100644 --- a/conf/machine/include/rk3288.inc +++ b/conf/machine/include/rk3288.inc @@ -4,8 +4,8 @@ SOC_FAMILY = "rk3288" require conf/machine/include/soc-family.inc -require conf/machine/include/arm/armv7a/tune-cortexa17.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv7a/tune-cortexa17.inc SERIAL_CONSOLES = "115200;ttyS2" diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc index 5a5dafd..2802d4e 100644 --- a/conf/machine/include/rk3308.inc +++ b/conf/machine/include/rk3308.inc @@ -3,8 +3,8 @@ SOC_FAMILY = "rk3308" DEFAULTTUNE ?= "cortexa35-crypto" require conf/machine/include/soc-family.inc -require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv8a/tune-cortexa35.inc require conf/machine/include/rockchip-wic.inc SERIAL_CONSOLES = "1500000;ttyS0" diff --git a/conf/machine/include/rk3328.inc b/conf/machine/include/rk3328.inc index 6be777c..4ecd681 100644 --- a/conf/machine/include/rk3328.inc +++ b/conf/machine/include/rk3328.inc @@ -6,8 +6,8 @@ SOC_FAMILY = "rk3328" DEFAULTTUNE ?= "cortexa53-crypto" require conf/machine/include/soc-family.inc -require conf/machine/include/arm/armv8a/tune-cortexa53.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv8a/tune-cortexa53.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index 5a3f439..47f0560 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -6,8 +6,8 @@ SOC_FAMILY = "rk3399" DEFAULTTUNE ?= "cortexa72-cortexa53-crypto" require conf/machine/include/soc-family.inc -require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv8a/tune-cortexa72-cortexa53.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc index 3c227dc..92d9d6d 100644 --- a/conf/machine/include/rk3568.inc +++ b/conf/machine/include/rk3568.inc @@ -3,8 +3,8 @@ SOC_FAMILY = "rk3568" DEFAULTTUNE ?= "cortexa55" require conf/machine/include/soc-family.inc -require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc index 6e700d8..6e01ede 100644 --- a/conf/machine/include/rk3588s.inc +++ b/conf/machine/include/rk3588s.inc @@ -2,8 +2,8 @@ SOC_FAMILY ?= "rk3588s" MACHINEOVERRIDES =. "rk3588s:" DEFAULTTUNE ?= "cortexa76-cortexa55-crypto" -require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc require conf/machine/include/rockchip-defaults.inc +require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc require conf/machine/include/rockchip-wic.inc KBUILD_DEFCONFIG ?= "defconfig" diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index e33a25c..e1634e2 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -1,5 +1,5 @@ # meta-rockchip default settings - +MACHINEOVERRIDES =. "rockchip:" # kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" KCONFIG_MODE ?= "alldefconfig" From patchwork Fri May 31 09:25:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44454 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 0DF8DC27C6F for ; Fri, 31 May 2024 09:25:55 +0000 (UTC) Received: from smtp-8fad.mail.infomaniak.ch (smtp-8fad.mail.infomaniak.ch [83.166.143.173]) by mx.groups.io with SMTP id smtpd.web10.7573.1717147545550912224 for ; Fri, 31 May 2024 02:25:45 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 83.166.143.173, 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-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHm75t3lzn4W; Fri, 31 May 2024 11:25:43 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm73GCVzWYK; Fri, 31 May 2024 11:25:43 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:13 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 06/16] bsp: u-boot: rework BL31 in EXTRA_OEMAKE MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-6-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:55 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/257 From: Quentin Schulz By making use of the newly added rockchip MACHINEOVERRIDES as well as SOC_FAMILY, the logic can be drastically simplified in addition to not needing to update BL31 for new SoCs. Signed-off-by: Quentin Schulz --- recipes-bsp/u-boot/u-boot_%.bbappend | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 7d2e4a0..c78c86f 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -7,21 +7,15 @@ DEPENDS:append:rk3308 = " u-boot-tools-native" DEPENDS:append:rock-pi-4 = " gnutls-native" DEPENDS:append:rk-u-boot-env = " u-boot-mkenvimage-native" -EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" -EXTRA_OEMAKE:append:rk3308 = " \ - BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3308.elf \ - ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin \ - " -EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" -EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -EXTRA_OEMAKE:append:rk3568 = " \ - BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3568.elf \ - ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3568.bin \ - " -EXTRA_OEMAKE:append:rk3588s = " \ - BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \ - ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \ - " +BL31:rockchip:aarch64 = "${DEPLOY_DIR_IMAGE}/bl31-${SOC_FAMILY}.elf" +# SOC_FAMILY for RK3588S is rk3588s but it should use the binaries from rk3588 +BL31:rk3588s = "${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf" +EXTRA_OEMAKE:append:rockchip:aarch64 = " BL31=${BL31}" + +# No open-source TPL (yet) +EXTRA_OEMAKE:append:rk3308 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin" +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" From patchwork Fri May 31 09:25:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44451 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 C9864C27C6E for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-bc0e.mail.infomaniak.ch (smtp-bc0e.mail.infomaniak.ch [45.157.188.14]) by mx.groups.io with SMTP id smtpd.web11.7555.1717147545681510323 for ; Fri, 31 May 2024 02:25:46 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 45.157.188.14, 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 4VrHm811SfznMJ; Fri, 31 May 2024 11:25:44 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm75mZJzVZQ; Fri, 31 May 2024 11:25:43 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:14 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 07/16] bsp: rkbin: rk3308-rkbin: PROVIDES rockchip-rkbin MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-7-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/258 From: Quentin Schulz This makes it possible to select rk3308-rkbin as a PREFERRED_PROVIDER for rockchip-rkbin, which makes it much easier to handle "flavors" in recipes where this dependency exists. Signed-off-by: Quentin Schulz --- recipes-bsp/rkbin/rk3308-rkbin_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-bsp/rkbin/rk3308-rkbin_git.bb b/recipes-bsp/rkbin/rk3308-rkbin_git.bb index c6b05b2..f32b57a 100644 --- a/recipes-bsp/rkbin/rk3308-rkbin_git.bb +++ b/recipes-bsp/rkbin/rk3308-rkbin_git.bb @@ -6,6 +6,7 @@ SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" SRCREV = "e65b97b511f1349156702db40694454c141d8fe2" PROVIDES += "trusted-firmware-a" +PROVIDES += "rockchip-rkbin" PROVIDES += "optee-os" inherit bin_package deploy From patchwork Fri May 31 09:25:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44450 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 BE189C27C5E for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-42ac.mail.infomaniak.ch (smtp-42ac.mail.infomaniak.ch [84.16.66.172]) by mx.groups.io with SMTP id smtpd.web10.7574.1717147546508498113 for ; Fri, 31 May 2024 02:25:46 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 84.16.66.172, 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 4VrHm86Jmnzr9y; Fri, 31 May 2024 11:25:44 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm80tX2zWGR; Fri, 31 May 2024 11:25:44 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:15 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 08/16] rk3308: move rockchip-rkbin selection to SoC conf file MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-8-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/259 From: Quentin Schulz The mechanism remains the same, except that everything that requires rockchip-rkbin doesn't need to know that rk3308 boards would prefer the rk3308-rkbin instead, it's abstracted by the PREFERRED_PROVIDER mechanism by BitBake. Signed-off-by: Quentin Schulz --- conf/machine/include/rk3308.inc | 2 ++ recipes-bsp/u-boot/u-boot_%.bbappend | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc index 2802d4e..94ce8e1 100644 --- a/conf/machine/include/rk3308.inc +++ b/conf/machine/include/rk3308.inc @@ -16,3 +16,5 @@ KERNEL_IMAGETYPE ?= "fitImage" UBOOT_SUFFIX ?= "itb" UBOOT_ENTRYPOINT ?= "0x06000000" + +PREFERRED_PROVIDER_rockchip-rkbin = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin', 'rk3308-rkbin', d)}" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index c78c86f..79314f7 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -19,7 +19,7 @@ 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 = " ${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin', 'rk3308-rkbin', d)}: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" From patchwork Fri May 31 09:25:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44448 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 B3CE1C27C55 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-190c.mail.infomaniak.ch (smtp-190c.mail.infomaniak.ch [185.125.25.12]) by mx.groups.io with SMTP id smtpd.web10.7575.1717147546771029835 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: 185.125.25.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 4VrHm91BYNzp7y; Fri, 31 May 2024 11:25:45 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm869DHzV68; Fri, 31 May 2024 11:25:44 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:16 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 09/16] bsp: u-boot: explicit dependency on trusted-firware-a MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-9-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/260 From: Quentin Schulz All Aarch64 boards require a BL31 from TF-A to be able to boot a Linux kernel. Therefore let's explicit this dependency right after adding the BL31 variable to EXTRA_OEMAKE. While it is already explicitly added later in the file, it is stored in a variable whose name is a bit confusing as TF-A has not much to do with being an init firmware. Signed-off-by: Quentin Schulz --- recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 79314f7..b4664d9 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -12,6 +12,10 @@ BL31:rockchip:aarch64 = "${DEPLOY_DIR_IMAGE}/bl31-${SOC_FAMILY}.elf" BL31:rk3588s = "${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf" EXTRA_OEMAKE:append:rockchip:aarch64 = " BL31=${BL31}" +TFA_DEPENDS ??= "" +TFA_DEPENDS:rockchip:aarch64 = " trusted-firmware-a:do_deploy" +do_compile[depends] .= "${TFA_DEPENDS}" + # No open-source TPL (yet) EXTRA_OEMAKE:append:rk3308 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin" EXTRA_OEMAKE:append:rk3568 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3568.bin" 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}" From patchwork Fri May 31 09:25:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44449 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 A4400C27C54 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-8fa9.mail.infomaniak.ch (smtp-8fa9.mail.infomaniak.ch [83.166.143.169]) by mx.groups.io with SMTP id smtpd.web11.7557.1717147547171917036 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: 83.166.143.169, 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-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHm957jQznCv; Fri, 31 May 2024 11:25:45 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm92x8jzTMb; Fri, 31 May 2024 11:25:45 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:18 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 11/16] bsp: u-boot: split things that can apply to any U-Boot into a .inc file MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-11-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/262 From: Quentin Schulz Anyone writing their own U-Boot recipe for their Rockchip-based board will need to repeat the same as currently done in a bbappend that only applies to the upstream u-boot recipe from OE-Core. This is both error-prone and more difficult to maintain as well as lowering the number of people actually using the code in meta-rockchip (thus increasing maintainer load by having less people debug the code). Move everything that is Rockchip-specific but reusable in an .inc file that can be included by other layers. Signed-off-by: Quentin Schulz --- recipes-bsp/u-boot/u-boot-rockchip.inc | 19 +++++++++++++++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 22 ++-------------------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-rockchip.inc b/recipes-bsp/u-boot/u-boot-rockchip.inc new file mode 100644 index 0000000..0a634fc --- /dev/null +++ b/recipes-bsp/u-boot/u-boot-rockchip.inc @@ -0,0 +1,19 @@ +BL31:rockchip:aarch64 = "${DEPLOY_DIR_IMAGE}/bl31-${SOC_FAMILY}.elf" +# SOC_FAMILY for RK3588S is rk3588s but it should use the binaries from rk3588 +BL31:rk3588s = "${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf" +EXTRA_OEMAKE:append:rockchip:aarch64 = " BL31=${BL31}" + +TFA_DEPENDS ??= "" +TFA_DEPENDS:rockchip:aarch64 = " trusted-firmware-a:do_deploy" +do_compile[depends] .= "${TFA_DEPENDS}" + +# No open-source TPL (yet) +EXTRA_OEMAKE:append:rk3308 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin" +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:rk3308 = " rockchip-rkbin:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3568 = " rockchip-rkbin:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" +do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}" diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend index 60f93a4..1f5f634 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,3 +1,5 @@ +require u-boot-rockchip.inc + FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" @@ -7,26 +9,6 @@ DEPENDS:append:rk3308 = " u-boot-tools-native" DEPENDS:append:rock-pi-4 = " gnutls-native" DEPENDS:append:rk-u-boot-env = " u-boot-mkenvimage-native" -BL31:rockchip:aarch64 = "${DEPLOY_DIR_IMAGE}/bl31-${SOC_FAMILY}.elf" -# SOC_FAMILY for RK3588S is rk3588s but it should use the binaries from rk3588 -BL31:rk3588s = "${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf" -EXTRA_OEMAKE:append:rockchip:aarch64 = " BL31=${BL31}" - -TFA_DEPENDS ??= "" -TFA_DEPENDS:rockchip:aarch64 = " trusted-firmware-a:do_deploy" -do_compile[depends] .= "${TFA_DEPENDS}" - -# No open-source TPL (yet) -EXTRA_OEMAKE:append:rk3308 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin" -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:rk3308 = " rockchip-rkbin:do_deploy" -INIT_FIRMWARE_DEPENDS:rk3568 = " rockchip-rkbin:do_deploy" -INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" -do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}" - do_compile:append:rock2-square () { # copy to default search path if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then From patchwork Fri May 31 09:25:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44447 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 96BBCC27C50 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-190d.mail.infomaniak.ch (smtp-190d.mail.infomaniak.ch [185.125.25.13]) by mx.groups.io with SMTP id smtpd.web11.7558.1717147547292964038 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: 185.125.25.13, 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-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHmB0177znCw; Fri, 31 May 2024 11:25:46 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm950s3zTp5; Fri, 31 May 2024 11:25:45 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:19 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 12/16] machine: rockchip-defaults: conditionally add closed-tpl MACHINEOVERRIDES MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-12-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/263 From: Quentin Schulz This adds closed-tpl to MACHINEOVERRIDES if ROCKCHIP_CLOSED_TPL is set to 1. This is a way to tell U-Boot that it needs to fetch the TPL from some place instead of building it. This will allow us to have a common logic in U-Boot, and also avoid touching the U-Boot recipe to add support for a new SoC. As there may be a transition phase during which we still have closed TPL by default but an open-source implementation exists, let's make it a weak assignment so it can be overridden from higher configuration files. Signed-off-by: Quentin Schulz --- conf/machine/include/rockchip-defaults.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/machine/include/rockchip-defaults.inc b/conf/machine/include/rockchip-defaults.inc index e1634e2..85ec7b9 100644 --- a/conf/machine/include/rockchip-defaults.inc +++ b/conf/machine/include/rockchip-defaults.inc @@ -1,4 +1,5 @@ # meta-rockchip default settings +MACHINEOVERRIDES =. "${@bb.utils.contains('ROCKCHIP_CLOSED_TPL', '1', 'closed-tpl:', '', d)}" MACHINEOVERRIDES =. "rockchip:" # kernel PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" From patchwork Fri May 31 09:25:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44446 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 831A2C27C52 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.web10.7576.1717147547792552810 for ; Fri, 31 May 2024 02:25:48 -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 4VrHmB2rKLzqJZ; Fri, 31 May 2024 11:25:46 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHm96zvPzTxP; Fri, 31 May 2024 11:25:45 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:20 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 13/16] machine: rk3308: mark all machines as to be using the closed TPL MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-13-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/264 From: Quentin Schulz This will be useful once we migrate the U-Boot recipe to use this new override. Signed-off-by: Quentin Schulz --- conf/machine/include/rk3308.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc index 94ce8e1..5abdd06 100644 --- a/conf/machine/include/rk3308.inc +++ b/conf/machine/include/rk3308.inc @@ -2,6 +2,8 @@ SOC_FAMILY = "rk3308" DEFAULTTUNE ?= "cortexa35-crypto" +ROCKCHIP_CLOSED_TPL ?= "1" + require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc require conf/machine/include/arm/armv8a/tune-cortexa35.inc From patchwork Fri May 31 09:25:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44443 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 74FE2C27C51 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-190d.mail.infomaniak.ch (smtp-190d.mail.infomaniak.ch [185.125.25.13]) by mx.groups.io with SMTP id smtpd.web10.7577.1717147547908654709 for ; Fri, 31 May 2024 02:25:48 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 185.125.25.13, 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-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHmB3h1HznCy; Fri, 31 May 2024 11:25:46 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHmB1nW2zVyh; Fri, 31 May 2024 11:25:46 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:21 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 14/16] machine: rk3568: mark all machines as to be using the closed TPL MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-14-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/265 From: Quentin Schulz This will be useful once we migrate the U-Boot recipe to use this new override. Signed-off-by: Quentin Schulz --- conf/machine/include/rk3568.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/include/rk3568.inc b/conf/machine/include/rk3568.inc index 92d9d6d..1da212a 100644 --- a/conf/machine/include/rk3568.inc +++ b/conf/machine/include/rk3568.inc @@ -2,6 +2,8 @@ SOC_FAMILY = "rk3568" DEFAULTTUNE ?= "cortexa55" +ROCKCHIP_CLOSED_TPL ?= "1" + require conf/machine/include/soc-family.inc require conf/machine/include/rockchip-defaults.inc require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc From patchwork Fri May 31 09:25:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44442 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 72EC8C27C44 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-bc0b.mail.infomaniak.ch (smtp-bc0b.mail.infomaniak.ch [45.157.188.11]) by mx.groups.io with SMTP id smtpd.web10.7578.1717147548272312716 for ; Fri, 31 May 2024 02:25:48 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 45.157.188.11, 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-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VrHmB5gfGznD0; Fri, 31 May 2024 11:25:46 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHmB3cMqzTxR; Fri, 31 May 2024 11:25:46 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:22 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 15/16] machine: rk3588/rk3588s: mark all machines as to be using the closed TPL MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-15-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/266 From: Quentin Schulz This will be useful once we migrate the U-Boot recipe to use this new override. Signed-off-by: Quentin Schulz --- conf/machine/include/rk3588s.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc index 6e01ede..cd84461 100644 --- a/conf/machine/include/rk3588s.inc +++ b/conf/machine/include/rk3588s.inc @@ -2,6 +2,8 @@ SOC_FAMILY ?= "rk3588s" MACHINEOVERRIDES =. "rk3588s:" DEFAULTTUNE ?= "cortexa76-cortexa55-crypto" +ROCKCHIP_CLOSED_TPL ?= "1" + require conf/machine/include/rockchip-defaults.inc require conf/machine/include/arm/armv8-2a/tune-cortexa76-cortexa55.inc require conf/machine/include/rockchip-wic.inc From patchwork Fri May 31 09:25:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 44441 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 652ADC25B75 for ; Fri, 31 May 2024 09:25:54 +0000 (UTC) Received: from smtp-8fa8.mail.infomaniak.ch (smtp-8fa8.mail.infomaniak.ch [83.166.143.168]) by mx.groups.io with SMTP id smtpd.web11.7559.1717147548729691470 for ; Fri, 31 May 2024 02:25:49 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 83.166.143.168, 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 4VrHmC0xSMzprK; Fri, 31 May 2024 11:25:47 +0200 (CEST) Received: from unknown by smtp-4-0001.mail.infomaniak.ch (Postfix) with ESMTPA id 4VrHmB5ZWHzWlJ; Fri, 31 May 2024 11:25:46 +0200 (CEST) From: Quentin Schulz Date: Fri, 31 May 2024 11:25:23 +0200 Subject: [PATCH meta-rockchip master scarthgap v3 16/16] bsp: u-boot-rockchip.inc: rework ROCKCHIP_TPL to use closed-tpl OVERRIDES MIME-Version: 1.0 Message-Id: <20240531-rk3588-family-v3-16-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/267 From: Quentin Schulz Since closed-tpl OVERRIDES allows us to have a common logic for all boards using ROCKCHIP_TPL in U-Boot for specifying external TPL blobs as DDR init, let's make use of it. This also allows us now to not have to care about the U-Boot recipe whenever a new SoC will be supported. Signed-off-by: Quentin Schulz --- recipes-bsp/u-boot/u-boot-rockchip.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-rockchip.inc b/recipes-bsp/u-boot/u-boot-rockchip.inc index 0a634fc..d2267cc 100644 --- a/recipes-bsp/u-boot/u-boot-rockchip.inc +++ b/recipes-bsp/u-boot/u-boot-rockchip.inc @@ -8,12 +8,11 @@ TFA_DEPENDS:rockchip:aarch64 = " trusted-firmware-a:do_deploy" do_compile[depends] .= "${TFA_DEPENDS}" # No open-source TPL (yet) -EXTRA_OEMAKE:append:rk3308 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3308.bin" -EXTRA_OEMAKE:append:rk3568 = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3568.bin" -EXTRA_OEMAKE:append:rk3588s = " ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin" +ROCKCHIP_TPL:closed-tpl = "${DEPLOY_DIR_IMAGE}/ddr-${SOC_FAMILY}.bin" +# SOC_FAMILY for RK3588S is rk3588s but it should use the binaries from rk3588 +ROCKCHIP_TPL:closed-tpl:rk3588s = "${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin" +EXTRA_OEMAKE:append:closed-tpl = " ROCKCHIP_TPL=${ROCKCHIP_TPL}" INIT_FIRMWARE_DEPENDS ??= "" -INIT_FIRMWARE_DEPENDS:rk3308 = " rockchip-rkbin:do_deploy" -INIT_FIRMWARE_DEPENDS:rk3568 = " rockchip-rkbin:do_deploy" -INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" +INIT_FIRMWARE_DEPENDS:closed-tpl = " rockchip-rkbin:do_deploy" do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}"