From patchwork Wed May 15 16:02:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43622 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 08EB6C25B7C for ; Wed, 15 May 2024 16:03:24 +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.20578.1715788999959489505 for ; Wed, 15 May 2024 09:03:20 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLG38FSzbMZ; Wed, 15 May 2024 18:03:18 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLG07c7zXpZ; Wed, 15 May 2024 18:03:17 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:02:55 +0200 Subject: [PATCH meta-rockchip v2 01/16] rk3588/rk3588s: add SOC_FAMILY MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-1-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/141 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 Wed May 15 16:02:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43625 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 2A33FC25B7E for ; Wed, 15 May 2024 16:03:24 +0000 (UTC) Received: from smtp-42a9.mail.infomaniak.ch (smtp-42a9.mail.infomaniak.ch [84.16.66.169]) by mx.groups.io with SMTP id smtpd.web10.20579.1715789000363682094 for ; Wed, 15 May 2024 09:03:20 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 84.16.66.169, mailfrom: foss+yocto@0leil.net) Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLG635GzZmt; Wed, 15 May 2024 18:03:18 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLG3mPHzZ4m; Wed, 15 May 2024 18:03:18 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:02:56 +0200 Subject: [PATCH meta-rockchip v2 02/16] rk3066: fix MACHINEOVERRIDES order MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-2-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/142 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 Wed May 15 16:02:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43627 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 38A30C25B7F for ; Wed, 15 May 2024 16:03:24 +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.20580.1715789000638293413 for ; Wed, 15 May 2024 09:03:20 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLH1txDzbt5; Wed, 15 May 2024 18:03:19 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLG6gtkzXWX; Wed, 15 May 2024 18:03:18 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:02:57 +0200 Subject: [PATCH meta-rockchip v2 03/16] rk3188: fix MACHINEOVERRIDES order MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-3-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/143 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 Wed May 15 16:02:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43620 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 D35C1C25B79 for ; Wed, 15 May 2024 16:03:23 +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.20583.1715789000953382231 for ; Wed, 15 May 2024 09:03:21 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLH4d5qzcgQ; Wed, 15 May 2024 18:03:19 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLH2CHxzZYM; Wed, 15 May 2024 18:03:19 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:02:58 +0200 Subject: [PATCH meta-rockchip v2 04/16] rk3288: fix MACHINEOVERRIDES order MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-4-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:23 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/144 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 Wed May 15 16:02:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43621 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 0878EC25B77 for ; Wed, 15 May 2024 16:03:24 +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.20584.1715789001348282109 for ; Wed, 15 May 2024 09:03:21 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLJ05xCzck9; Wed, 15 May 2024 18:03:20 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLH4htRzZKK; Wed, 15 May 2024 18:03:19 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:02:59 +0200 Subject: [PATCH meta-rockchip v2 05/16] add rockchip MACHINEOVERRIDES MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-5-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/145 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 2387eb9..b15725d 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 Wed May 15 16:03:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43626 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 1A244C25B7B for ; Wed, 15 May 2024 16:03:24 +0000 (UTC) Received: from smtp-bc0d.mail.infomaniak.ch (smtp-bc0d.mail.infomaniak.ch [45.157.188.13]) by mx.groups.io with SMTP id smtpd.web10.20586.1715789001732301016 for ; Wed, 15 May 2024 09:03:22 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 45.157.188.13, mailfrom: foss+yocto@0leil.net) Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLJ2R41zbt8; Wed, 15 May 2024 18:03:20 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLJ0834zXcL; Wed, 15 May 2024 18:03:19 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:00 +0200 Subject: [PATCH meta-rockchip v2 06/16] bsp: u-boot: rework BL31 in EXTRA_OEMAKE MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-6-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/146 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 a83179a..7e0d1d1 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -3,21 +3,15 @@ DEPENDS:append = " python3-pyelftools-native" DEPENDS:append:rk3308 = " u-boot-tools-native" DEPENDS:append:rock-pi-4 = " gnutls-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 Wed May 15 16:03:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43624 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 D2A6DC41513 for ; Wed, 15 May 2024 16:03:23 +0000 (UTC) Received: from smtp-bc0a.mail.infomaniak.ch (smtp-bc0a.mail.infomaniak.ch [45.157.188.10]) by mx.groups.io with SMTP id smtpd.web10.20587.1715789002329836311 for ; Wed, 15 May 2024 09:03:22 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 45.157.188.10, mailfrom: foss+yocto@0leil.net) Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLJ4tWqzJj9; Wed, 15 May 2024 18:03:20 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLJ2f95zYh4; Wed, 15 May 2024 18:03:20 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:01 +0200 Subject: [PATCH meta-rockchip v2 07/16] bsp: rkbin: rk3308-rkbin: PROVIDES rockchip-rkbin MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-7-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:23 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/147 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 Wed May 15 16:03:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43623 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 24D47C25B7D for ; Wed, 15 May 2024 16:03:24 +0000 (UTC) Received: from smtp-8fab.mail.infomaniak.ch (smtp-8fab.mail.infomaniak.ch [83.166.143.171]) by mx.groups.io with SMTP id smtpd.web11.20277.1715789002645800755 for ; Wed, 15 May 2024 09:03:22 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 83.166.143.171, mailfrom: foss+yocto@0leil.net) Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLK1Hxxzd4W; Wed, 15 May 2024 18:03:21 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLJ5ZVQzZc4; Wed, 15 May 2024 18:03:20 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:02 +0200 Subject: [PATCH meta-rockchip v2 08/16] rk3308: move rockchip-rkbin selection to SoC conf file MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-8-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/148 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 7e0d1d1..a054b92 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -15,7 +15,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 Wed May 15 16:03:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43629 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 38C4DC27C43 for ; Wed, 15 May 2024 16:03:24 +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.web10.20589.1715789003276018757 for ; Wed, 15 May 2024 09:03:23 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLK4b12zPqh; Wed, 15 May 2024 18:03:21 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLK22QKzb5Y; Wed, 15 May 2024 18:03:21 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:03 +0200 Subject: [PATCH meta-rockchip v2 09/16] bsp: u-boot: explicit dependency on trusted-firware-a MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-9-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/149 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 a054b92..3b3e0ba 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -8,6 +8,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 Wed May 15 16:03:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43628 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 46AB1C27C41 for ; Wed, 15 May 2024 16:03:24 +0000 (UTC) Received: from smtp-bc09.mail.infomaniak.ch (smtp-bc09.mail.infomaniak.ch [45.157.188.9]) by mx.groups.io with SMTP id smtpd.web10.20591.1715789003477807604 for ; Wed, 15 May 2024 09:03:23 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 45.157.188.9, mailfrom: foss+yocto@0leil.net) Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLL08rgzZNV; Wed, 15 May 2024 18:03:22 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLK4Y4yzZSK; Wed, 15 May 2024 18:03:21 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:04 +0200 Subject: [PATCH meta-rockchip v2 10/16] bsp: u-boot: remove duplicate trusted-firmware-a dependency for SoCs with open DDR init MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-10-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:24 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/150 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 3b3e0ba..5502e31 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -18,10 +18,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 Wed May 15 16:03:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43630 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 402CAC25B75 for ; Wed, 15 May 2024 16:03:34 +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.20278.1715789004044357602 for ; Wed, 15 May 2024 09:03:24 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLL2v0NzKr1; Wed, 15 May 2024 18:03:22 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLL0D0YzZ4n; Wed, 15 May 2024 18:03:22 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:05 +0200 Subject: [PATCH meta-rockchip v2 11/16] bsp: u-boot: split things that can apply to any U-Boot into a .inc file MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-11-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/151 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 5502e31..088a52c 100644 --- a/recipes-bsp/u-boot/u-boot_%.bbappend +++ b/recipes-bsp/u-boot/u-boot_%.bbappend @@ -1,28 +1,10 @@ +require u-boot-rockchip.inc + # various machines require the pyelftools library for parsing dtb files DEPENDS:append = " python3-pyelftools-native" DEPENDS:append:rk3308 = " u-boot-tools-native" DEPENDS:append:rock-pi-4 = " gnutls-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 Wed May 15 16:03:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43634 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 59036C25B77 for ; Wed, 15 May 2024 16:03:34 +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.web11.20279.1715789004115508799 for ; Wed, 15 May 2024 09:03:24 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLL5BkkzLct; Wed, 15 May 2024 18:03:22 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLL2x8rzbHK; Wed, 15 May 2024 18:03:22 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:06 +0200 Subject: [PATCH meta-rockchip v2 12/16] machine: rockchip-defaults: conditionally add closed-tpl MACHINEOVERRIDES MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-12-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/152 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 b15725d..8dc03cf 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 Wed May 15 16:03:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 43633 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 684CEC25B7C for ; Wed, 15 May 2024 16:03:34 +0000 (UTC) Received: from smtp-42ad.mail.infomaniak.ch (smtp-42ad.mail.infomaniak.ch [84.16.66.173]) by mx.groups.io with SMTP id smtpd.web11.20280.1715789004699294051 for ; Wed, 15 May 2024 09:03:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 84.16.66.173, mailfrom: foss+yocto@0leil.net) Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLM1B8nzTG9; Wed, 15 May 2024 18:03:23 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLL5v6VzXCS; Wed, 15 May 2024 18:03:22 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:07 +0200 Subject: [PATCH meta-rockchip v2 13/16] machine: rk3308: mark all machines as to be using the closed TPL MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-13-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/153 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 Wed May 15 16:03: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: 43635 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 75EE3C25B7B for ; Wed, 15 May 2024 16:03:34 +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.20593.1715789005323833029 for ; Wed, 15 May 2024 09:03:25 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLM4s9HzNKs; Wed, 15 May 2024 18:03:23 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLM2kGkzZSL; Wed, 15 May 2024 18:03:23 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:08 +0200 Subject: [PATCH meta-rockchip v2 14/16] machine: rk3568: mark all machines as to be using the closed TPL MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-14-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/154 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 Wed May 15 16:03: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: 43631 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 44E11C41513 for ; Wed, 15 May 2024 16:03:34 +0000 (UTC) Received: from smtp-8fab.mail.infomaniak.ch (smtp-8fab.mail.infomaniak.ch [83.166.143.171]) by mx.groups.io with SMTP id smtpd.web11.20281.1715789005403832283 for ; Wed, 15 May 2024 09:03:25 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: 0leil.net, ip: 83.166.143.171, mailfrom: foss+yocto@0leil.net) Received: from smtp-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-4-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLN001FzbQ6; Wed, 15 May 2024 18:03:23 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLM4wxyzb32; Wed, 15 May 2024 18:03:23 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:09 +0200 Subject: [PATCH meta-rockchip v2 15/16] machine: rk3588/rk3588s: mark all machines as to be using the closed TPL MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-15-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/155 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 Wed May 15 16:03: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: 43632 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 4F2B7C25B79 for ; Wed, 15 May 2024 16:03:34 +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.20283.1715789005928622381 for ; Wed, 15 May 2024 09:03:26 -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-3-0000.mail.infomaniak.ch (smtp-3-0000.mail.infomaniak.ch [10.4.36.107]) by smtp-3-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4VfdLN33vNzMGH; Wed, 15 May 2024 18:03:24 +0200 (CEST) Received: from unknown by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4VfdLN0SmZzZ03; Wed, 15 May 2024 18:03:24 +0200 (CEST) From: Quentin Schulz Date: Wed, 15 May 2024 18:03:10 +0200 Subject: [PATCH meta-rockchip v2 16/16] bsp: u-boot-rockchip.inc: rework ROCKCHIP_TPL to use closed-tpl OVERRIDES MIME-Version: 1.0 Message-Id: <20240515-rk3588-family-v2-16-f81897a3ac50@cherry.de> References: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> In-Reply-To: <20240515-rk3588-family-v2-0-f81897a3ac50@cherry.de> To: Quentin Schulz , yocto-patches@lists.yoctoproject.org 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 ; Wed, 15 May 2024 16:03:34 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/156 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}"