[meta-rockchip][PATCH v2 1/4] u-boot: switch to upstream SRCREV for rk-u-boot-env

[meta-rockchip][PATCH v2 1/4] u-boot: switch to upstream SRCREV for rk-u-boot-env

[Trevor Woerner]

When the rk-u-boot-env feature was implemented, in order for it to work the
build needed a version of U-Boot that was slightly newer than 2024.04 (the
current release supported by Yocto at that time). Now that 2024.10 is out,
remove the SRCREV pin since the necessary code is now part of this release.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes from v1:
- add [meta-rockchip] to subject
---
 recipes-bsp/u-boot/u-boot_%.bbappend | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
index de7024545841..06ba6d54de8e 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -7,7 +7,6 @@ SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
 SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
 
 SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg"
-SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a"
 
 DEPENDS:append:rk3308 = " u-boot-tools-native"
 DEPENDS:append:rock-pi-4 = " gnutls-native"
-- 
2.44.0.478.g7774cfed6261

[meta-rockchip][PATCH v2 2/4] u-boot: use upstream for radxa-zero-3{e|w}

[Trevor Woerner]

Upstream U-Boot 2024.10 (the latest release supported by Yocto) has support
for radxa-zero-3{e|w}. Therefore switch away from the fork where the initial
U-Boot development for this board had been added.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes from v1:
- add [meta-rockchip] to subject
---
 recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
index 06ba6d54de8e..08e1730b5d3d 100644
--- a/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -2,10 +2,6 @@ require u-boot-rockchip.inc
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
-SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
-SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
-
 SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg"
 
 DEPENDS:append:rk3308 = " u-boot-tools-native"
-- 
2.44.0.478.g7774cfed6261

Re: [yocto-patches] [meta-rockchip][PATCH v2 2/4] u-boot: use upstream for radxa-zero-3{e|w}

[Oleksii Kurochko]

[-- Attachment #1: Type: text/plain, Size: 1566 bytes --]


On 12/13/24 4:48 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> Upstream U-Boot 2024.10 (the latest release supported by Yocto) has support
> for radxa-zero-3{e|w}. Therefore switch away from the fork where the initial
> U-Boot development for this board had been added.
>
> Signed-off-by: Trevor Woerner<twoerner@gmail.com>

If this patch is the next version ofhttps://lore.kernel.org/yocto-patches/20241212195718.25203-1-twoerner@gmail.com/T/#t

then Reported-by tag disappeared. ( it is not critical for me, feel free not to add it )

Checked on my side and LGTM: Reviewed-by: Oleksii Kurochko<oleksii.kurochko@gmail.com>.

Thanks.

Best regards,

  Oleksii

> ---
> changes from v1:
> - add [meta-rockchip] to subject
> ---
>   recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
> index 06ba6d54de8e..08e1730b5d3d 100644
> --- a/recipes-bsp/u-boot/u-boot_%.bbappend
> +++ b/recipes-bsp/u-boot/u-boot_%.bbappend
> @@ -2,10 +2,6 @@ require u-boot-rockchip.inc
>   
>   FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
>   
> -SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
> -SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> -SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> -
>   SRC_URI:append:rk-u-boot-env =" file://rockchip-enable-environment-mmc.cfg"
>   
>   DEPENDS:append:rk3308 = " u-boot-tools-native"

[-- Attachment #2: Type: text/html, Size: 2493 bytes --]

Re: [yocto-patches] [meta-rockchip][PATCH v2 2/4] u-boot: use upstream for radxa-zero-3{e|w}

[Trevor Woerner]

On Sun 2024-12-15 @ 06:28:15 PM, Oleksii Kurochko via lists.yoctoproject.org wrote:
> 
> On 12/13/24 4:48 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> > Upstream U-Boot 2024.10 (the latest release supported by Yocto) has support
> > for radxa-zero-3{e|w}. Therefore switch away from the fork where the initial
> > U-Boot development for this board had been added.
> > 
> > Signed-off-by: Trevor Woerner<twoerner@gmail.com>
> 
> If this patch is the next version ofhttps://lore.kernel.org/yocto-patches/20241212195718.25203-1-twoerner@gmail.com/T/#t
> 
> then Reported-by tag disappeared. ( it is not critical for me, feel free not to add it )
> 
> Checked on my side and LGTM: Reviewed-by: Oleksii Kurochko<oleksii.kurochko@gmail.com>.
> 
> Thanks.

Yes, apologies for this and the other one too. The tags will be in the
commits.

Thanks for reporting and for your review!

> Best regards,
> 
>  Oleksii
> 
> > ---
> > changes from v1:
> > - add [meta-rockchip] to subject
> > ---
> >   recipes-bsp/u-boot/u-boot_%.bbappend | 4 ----
> >   1 file changed, 4 deletions(-)
> > 
> > diff --git a/recipes-bsp/u-boot/u-boot_%.bbappend b/recipes-bsp/u-boot/u-boot_%.bbappend
> > index 06ba6d54de8e..08e1730b5d3d 100644
> > --- a/recipes-bsp/u-boot/u-boot_%.bbappend
> > +++ b/recipes-bsp/u-boot/u-boot_%.bbappend
> > @@ -2,10 +2,6 @@ require u-boot-rockchip.inc
> >   FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
> > -SRC_URI:radxa-zero-3 = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
> > -SRCREV:radxa-zero-3 = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> > -SRCREV:radxa-zero-3:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c"
> > -
> >   SRC_URI:append:rk-u-boot-env =" file://rockchip-enable-environment-mmc.cfg"
> >   DEPENDS:append:rk3308 = " u-boot-tools-native"
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#914): https://lists.yoctoproject.org/g/yocto-patches/message/914
> Mute This Topic: https://lists.yoctoproject.org/mt/110099067/900817
> Group Owner: yocto-patches+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [twoerner@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 
> 

[meta-rockchip][PATCH v2 3/4] radxa-zero-3: switch to yocto-dev kernel

[Trevor Woerner]

The radxa-zero-3{e|w} devices are not supported in the current yocto kernel,
but they are supported in the yocto-dev kernel. Switch to yocto-dev until
support is available in the yocto kernel.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes from v1:
- add [meta-rockchip] to subject
---
 conf/machine/include/radxa-zero-3.inc         |  2 +-
 ...xt_%.bbappend => linux-yocto-dev.bbappend} |  0
 .../linux/linux-torvalds-next_git.bb          | 25 -------------------
 recipes-kernel/linux/linux-yocto-dev.bbappend |  2 ++
 4 files changed, 3 insertions(+), 26 deletions(-)
 rename dynamic-layers/rk-rauc-demo/recipes-kernel/linux/{linux-torvalds-next_%.bbappend => linux-yocto-dev.bbappend} (100%)
 delete mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb

diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
index 1c6f972c1e31..b351afae8c0f 100644
--- a/conf/machine/include/radxa-zero-3.inc
+++ b/conf/machine/include/radxa-zero-3.inc
@@ -2,7 +2,7 @@ MACHINEOVERRIDES =. "radxa-zero-3:"
 
 require conf/machine/include/rk3566.inc
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
 MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
 
 UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
similarity index 100%
rename from dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend
rename to dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb
deleted file mode 100644
index b961b1408f09..000000000000
--- a/recipes-kernel/linux/linux-torvalds-next_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:"
-
-DESCRIPTION = "Linux Kernel"
-SECTION = "kernel"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-
-ERROR_QA:remove = "buildpaths"
-DEFAULT_PREFERENCE = "-1"
-COMPATIBLE_MACHINE = "^$"
-COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
-
-LINUX_VERSION = "6.11-rc6"
-KERNEL_VERSION_SANITY_SKIP = "1"
-PV = "${LINUX_VERSION}+git${SRCPV}"
-SRC_URI = " \
-	git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \
-	file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \
-	"
-# this is tag 'next-20240904'
-SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba"
-
-inherit kernel
-inherit kernel-yocto
-require recipes-kernel/linux/linux-yocto.inc
diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
index b6a63d7b7b29..f738d1357d6c 100644
--- a/recipes-kernel/linux/linux-yocto-dev.bbappend
+++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
@@ -1,5 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
+COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
 
 SRC_URI:append:orangepi-5-plus = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
+SRC_URI:append:radxa-zero-3 = " file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
-- 
2.44.0.478.g7774cfed6261

Re: [yocto-patches] [meta-rockchip][PATCH v2 3/4] radxa-zero-3: switch to yocto-dev kernel

[Oleksii Kurochko]

[-- Attachment #1: Type: text/plain, Size: 3982 bytes --]

On 12/13/24 4:48 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> The radxa-zero-3{e|w} devices are not supported in the current yocto kernel,
> but they are supported in the yocto-dev kernel. Switch to yocto-dev until
> support is available in the yocto kernel.
>
> Signed-off-by: Trevor Woerner<twoerner@gmail.com>

If this patch is the next version ofhttps://lore.kernel.org/yocto-patches/20241212195718.25203-1-twoerner@gmail.com/T/#t

then Reported-by tag disappeared. ( it is not critical for me, feel free not to add it )

Checked on my side and LGTM: Reviewed-by: Oleksii Kurochko<oleksii.kurochko@gmail.com>.

Thanks.

Best regards,

  Oleksii


> ---
> changes from v1:
> - add [meta-rockchip] to subject
> ---
>   conf/machine/include/radxa-zero-3.inc         |  2 +-
>   ...xt_%.bbappend => linux-yocto-dev.bbappend} |  0
>   .../linux/linux-torvalds-next_git.bb          | 25 -------------------
>   recipes-kernel/linux/linux-yocto-dev.bbappend |  2 ++
>   4 files changed, 3 insertions(+), 26 deletions(-)
>   rename dynamic-layers/rk-rauc-demo/recipes-kernel/linux/{linux-torvalds-next_%.bbappend => linux-yocto-dev.bbappend} (100%)
>   delete mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb
>
> diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
> index 1c6f972c1e31..b351afae8c0f 100644
> --- a/conf/machine/include/radxa-zero-3.inc
> +++ b/conf/machine/include/radxa-zero-3.inc
> @@ -2,7 +2,7 @@ MACHINEOVERRIDES =. "radxa-zero-3:"
>   
>   require conf/machine/include/rk3566.inc
>   
> -PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next"
> +PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
>   MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
>   
>   UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
> diff --git a/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend b/dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
> similarity index 100%
> rename from dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-torvalds-next_%.bbappend
> rename to dynamic-layers/rk-rauc-demo/recipes-kernel/linux/linux-yocto-dev.bbappend
> diff --git a/recipes-kernel/linux/linux-torvalds-next_git.bb b/recipes-kernel/linux/linux-torvalds-next_git.bb
> deleted file mode 100644
> index b961b1408f09..000000000000
> --- a/recipes-kernel/linux/linux-torvalds-next_git.bb
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:"
> -
> -DESCRIPTION = "Linux Kernel"
> -SECTION = "kernel"
> -LICENSE = "GPL-2.0-only"
> -LIC_FILES_CHKSUM ="file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
> -
> -ERROR_QA:remove = "buildpaths"
> -DEFAULT_PREFERENCE = "-1"
> -COMPATIBLE_MACHINE = "^$"
> -COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
> -
> -LINUX_VERSION = "6.11-rc6"
> -KERNEL_VERSION_SANITY_SKIP = "1"
> -PV = "${LINUX_VERSION}+git${SRCPV}"
> -SRC_URI = " \
> -	git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;nobranch=1 \
> -	file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \
> -	"
> -# this is tag 'next-20240904'
> -SRCREV = "fdadd93817f124fd0ea6ef251d4a1068b7feceba"
> -
> -inherit kernel
> -inherit kernel-yocto
> -require recipes-kernel/linux/linux-yocto.inc
> diff --git a/recipes-kernel/linux/linux-yocto-dev.bbappend b/recipes-kernel/linux/linux-yocto-dev.bbappend
> index b6a63d7b7b29..f738d1357d6c 100644
> --- a/recipes-kernel/linux/linux-yocto-dev.bbappend
> +++ b/recipes-kernel/linux/linux-yocto-dev.bbappend
> @@ -1,5 +1,7 @@
>   FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
>   
>   COMPATIBLE_MACHINE:orangepi-5-plus = "orangepi-5-plus"
> +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3"
>   
>   SRC_URI:append:orangepi-5-plus =" 
> file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"
> +SRC_URI:append:radxa-zero-3 =" 
> file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta"

[-- Attachment #2: Type: text/html, Size: 5191 bytes --]

[meta-rockchip][PATCH v2 4/4] rk3308: add provider for trusted firmware-a

[Trevor Woerner]

A PREFERRED_PROVIDER entry was missed for rk3308 builds:

	NOTE: Multiple providers are available for trusted-firmware-a (rk3308-rkbin, rockchip-rkbin-tf-a)
	Consider defining a PREFERRED_PROVIDER entry to match trusted-firmware-a

This allows the RKBIN_RK3308_LATEST knob to work in all cases again.

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
changes from v1
- added
---
 conf/machine/include/rk3308.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc
index 1ecf085cd5de..d30901f15b4f 100644
--- a/conf/machine/include/rk3308.inc
+++ b/conf/machine/include/rk3308.inc
@@ -19,6 +19,7 @@ KERNEL_IMAGETYPE ?= "fitImage"
 UBOOT_SUFFIX ?= "itb"
 UBOOT_ENTRYPOINT ?= "0x06000000"
 
+PREFERRED_PROVIDER_trusted-firmware-a = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-tf-a', 'rk3308-rkbin', d)}"
 PREFERRED_PROVIDER_rockchip-rkbin-ddr = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-ddr', 'rk3308-rkbin', d)}"
 PREFERRED_PROVIDER_rockchip-rkbin-tf-a = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-tf-a', 'rk3308-rkbin', d)}"
 PREFERRED_PROVIDER_rockchip-rkbin-optee-os = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-optee-os', 'rk3308-rkbin', d)}"
-- 
2.44.0.478.g7774cfed6261

Re: [yocto-patches] [meta-rockchip][PATCH v2 4/4] rk3308: add provider for trusted firmware-a

[Quentin Schulz]

Hi Trevor,

On 12/13/24 4:48 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> A PREFERRED_PROVIDER entry was missed for rk3308 builds:
> 
> 	NOTE: Multiple providers are available for trusted-firmware-a (rk3308-rkbin, rockchip-rkbin-tf-a)
> 	Consider defining a PREFERRED_PROVIDER entry to match trusted-firmware-a
> 
> This allows the RKBIN_RK3308_LATEST knob to work in all cases again.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
> changes from v1
> - added
> ---
>   conf/machine/include/rk3308.inc | 1 +
>   1 file changed, 1 insertion(+)
> 
> diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc
> index 1ecf085cd5de..d30901f15b4f 100644
> --- a/conf/machine/include/rk3308.inc
> +++ b/conf/machine/include/rk3308.inc
> @@ -19,6 +19,7 @@ KERNEL_IMAGETYPE ?= "fitImage"
>   UBOOT_SUFFIX ?= "itb"
>   UBOOT_ENTRYPOINT ?= "0x06000000"
>   
> +PREFERRED_PROVIDER_trusted-firmware-a = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-tf-a', 'rk3308-rkbin', d)}"

PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a"

Should be enough I believe, and it would be consistent with rk3566, 
rk3568 and rk3588s where we already have that.

Anyone requesting trusted-firmware-a would get rockchip-rkbin-tf-a. When 
that happens, BitBake will check PREFERRED_PROVIDER_rockchip-rkbin-tf-a 
and pick what it should.

By having the suggested implementation, it would technically be possible 
to have someone request trusted-firmware-a to be rk3308-rkbin and 
rockchip-rkbin-tf-a (the provider) be rockchip-rkbin-tf-a (the recipe). 
Basically, we use a knob where there's no need to.

Cheers,
Quentin

Re: [yocto-patches] [meta-rockchip][PATCH v2 4/4] rk3308: add provider for trusted firmware-a

[Trevor Woerner]

On Fri 2024-12-13 @ 05:28:40 PM, Quentin Schulz via lists.yoctoproject.org wrote:
> Hi Trevor,
> 
> On 12/13/24 4:48 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> > A PREFERRED_PROVIDER entry was missed for rk3308 builds:
> > 
> > 	NOTE: Multiple providers are available for trusted-firmware-a (rk3308-rkbin, rockchip-rkbin-tf-a)
> > 	Consider defining a PREFERRED_PROVIDER entry to match trusted-firmware-a
> > 
> > This allows the RKBIN_RK3308_LATEST knob to work in all cases again.
> > 
> > Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> > ---
> > changes from v1
> > - added
> > ---
> >   conf/machine/include/rk3308.inc | 1 +
> >   1 file changed, 1 insertion(+)
> > 
> > diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc
> > index 1ecf085cd5de..d30901f15b4f 100644
> > --- a/conf/machine/include/rk3308.inc
> > +++ b/conf/machine/include/rk3308.inc
> > @@ -19,6 +19,7 @@ KERNEL_IMAGETYPE ?= "fitImage"
> >   UBOOT_SUFFIX ?= "itb"
> >   UBOOT_ENTRYPOINT ?= "0x06000000"
> > +PREFERRED_PROVIDER_trusted-firmware-a = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-tf-a', 'rk3308-rkbin', d)}"
> 
> PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a"
> 
> Should be enough I believe, and it would be consistent with rk3566, rk3568
> and rk3588s where we already have that.

This fails when RKBIN_RK3308_LATEST is not defined:

	ERROR: Multiple .bb files are due to be built which each provide rockchip-rkbin-tf-a
	  /scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb
	  /scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb
	A list of tasks depending on these providers is shown and may help explain where the dependency comes from.
	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique dependees:

	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique dependees:

	It could be that one recipe provides something the other doesn't and should. The following provider and runtime provider differences may be helpful.
	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique provides:

	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique rprovides:
	  ^rockchip-rkbin-tf-a-locale-.*
	  rockchip-rkbin-tf-a
	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique provides:
	  rockchip-rkbin-optee-os
	  rk3308-rkbin
	  rockchip-rkbin-ddr
	  optee-os
	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique rprovides:
	  rk3308-rkbin
	  ^rk3308-rkbin-locale-.*
	ERROR: Multiple .bb files are due to be built which each provide trusted-firmware-a:
	  /scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb
	  /scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb
	A list of tasks depending on these providers is shown and may help explain where the dependency comes from.
	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique dependees:

	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique dependees:

	It could be that one recipe provides something the other doesn't and should. The following provider and runtime provider differences may be helpful.
	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique provides:

	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique rprovides:
	  ^rockchip-rkbin-tf-a-locale-.*
	  rockchip-rkbin-tf-a
	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique provides:
	  rockchip-rkbin-optee-os
	  rk3308-rkbin
	  rockchip-rkbin-ddr
	  optee-os
	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique rprovides:
	  rk3308-rkbin
	  ^rk3308-rkbin-locale-.*


The way I suggested builds in all cases, and runs fine both ways too.

> Anyone requesting trusted-firmware-a would get rockchip-rkbin-tf-a. When
> that happens, BitBake will check PREFERRED_PROVIDER_rockchip-rkbin-tf-a and
> pick what it should.
> 
> By having the suggested implementation, it would technically be possible to
> have someone request trusted-firmware-a to be rk3308-rkbin and
> rockchip-rkbin-tf-a (the provider) be rockchip-rkbin-tf-a (the recipe).
> Basically, we use a knob where there's no need to.
> 
> Cheers,
> Quentin
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#905): https://lists.yoctoproject.org/g/yocto-patches/message/905
> Mute This Topic: https://lists.yoctoproject.org/mt/110099069/900817
> Group Owner: yocto-patches+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto-patches/leave/13168745/900817/63955952/xyzzy [twoerner@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 
> 

Re: [yocto-patches] [meta-rockchip][PATCH v2 4/4] rk3308: add provider for trusted firmware-a

[Quentin Schulz]

Hi Trevor,

On 12/13/24 6:11 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> On Fri 2024-12-13 @ 05:28:40 PM, Quentin Schulz via lists.yoctoproject.org wrote:
>> Hi Trevor,
>>
>> On 12/13/24 4:48 PM, Trevor Woerner via lists.yoctoproject.org wrote:
>>> A PREFERRED_PROVIDER entry was missed for rk3308 builds:
>>>
>>> 	NOTE: Multiple providers are available for trusted-firmware-a (rk3308-rkbin, rockchip-rkbin-tf-a)
>>> 	Consider defining a PREFERRED_PROVIDER entry to match trusted-firmware-a
>>>
>>> This allows the RKBIN_RK3308_LATEST knob to work in all cases again.
>>>
>>> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
>>> ---
>>> changes from v1
>>> - added
>>> ---
>>>    conf/machine/include/rk3308.inc | 1 +
>>>    1 file changed, 1 insertion(+)
>>>
>>> diff --git a/conf/machine/include/rk3308.inc b/conf/machine/include/rk3308.inc
>>> index 1ecf085cd5de..d30901f15b4f 100644
>>> --- a/conf/machine/include/rk3308.inc
>>> +++ b/conf/machine/include/rk3308.inc
>>> @@ -19,6 +19,7 @@ KERNEL_IMAGETYPE ?= "fitImage"
>>>    UBOOT_SUFFIX ?= "itb"
>>>    UBOOT_ENTRYPOINT ?= "0x06000000"
>>> +PREFERRED_PROVIDER_trusted-firmware-a = "${@bb.utils.contains('RKBIN_RK3308_LATEST', '1', 'rockchip-rkbin-tf-a', 'rk3308-rkbin', d)}"
>>
>> PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin-tf-a"
>>
>> Should be enough I believe, and it would be consistent with rk3566, rk3568
>> and rk3588s where we already have that.
> 
> This fails when RKBIN_RK3308_LATEST is not defined:
> 
> 	ERROR: Multiple .bb files are due to be built which each provide rockchip-rkbin-tf-a
> 	  /scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb
> 	  /scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb
> 	A list of tasks depending on these providers is shown and may help explain where the dependency comes from.
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique dependees:
> 
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique dependees:
> 
> 	It could be that one recipe provides something the other doesn't and should. The following provider and runtime provider differences may be helpful.
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique provides:
> 
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique rprovides:
> 	  ^rockchip-rkbin-tf-a-locale-.*
> 	  rockchip-rkbin-tf-a
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique provides:
> 	  rockchip-rkbin-optee-os
> 	  rk3308-rkbin
> 	  rockchip-rkbin-ddr
> 	  optee-os
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique rprovides:
> 	  rk3308-rkbin
> 	  ^rk3308-rkbin-locale-.*
> 	ERROR: Multiple .bb files are due to be built which each provide trusted-firmware-a:
> 	  /scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb
> 	  /scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb
> 	A list of tasks depending on these providers is shown and may help explain where the dependency comes from.
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique dependees:
> 
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique dependees:
> 
> 	It could be that one recipe provides something the other doesn't and should. The following provider and runtime provider differences may be helpful.
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique provides:
> 
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb has unique rprovides:
> 	  ^rockchip-rkbin-tf-a-locale-.*
> 	  rockchip-rkbin-tf-a
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique provides:
> 	  rockchip-rkbin-optee-os
> 	  rk3308-rkbin
> 	  rockchip-rkbin-ddr
> 	  optee-os
> 	/scratch/trevor/oe/builds/meta-rockchip/layers/meta-rockchip/recipes-bsp/rkbin/rk3308-rkbin_git.bb has unique rprovides:
> 	  rk3308-rkbin
> 	  ^rk3308-rkbin-locale-.*
> 
> 
> The way I suggested builds in all cases, and runs fine both ways too.
> 

Wondering if the righthand of PREFERRED_PROVIDER is pointing to a 
recipe? We have kind a special case with a virtual provider matching a 
recipe, maybe that's tripping some code.

I'm wondering whether we shouldn't merge rk3308-rkbin with the other 
ones and have RKBIN_RK3308_LATEST handled in the recipes directly.

In any case, not necessary for now.

Thus, since it fixes the actual issue this patch seems fine:

Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>

Thanks!
Quentin

Re: [meta-rockchip][PATCH v2 4/4] rk3308: add provider for trusted firmware-a

[Trevor Woerner]

On Fri 2024-12-13 @ 10:48:43 AM, Trevor Woerner wrote:
> A PREFERRED_PROVIDER entry was missed for rk3308 builds:
> 
> 	NOTE: Multiple providers are available for trusted-firmware-a (rk3308-rkbin, rockchip-rkbin-tf-a)
> 	Consider defining a PREFERRED_PROVIDER entry to match trusted-firmware-a
> 
> This allows the RKBIN_RK3308_LATEST knob to work in all cases again.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> ---
> changes from v1
> - added
> ---
>  conf/machine/include/rk3308.inc | 1 +
>  1 file changed, 1 insertion(+)

Added to meta-rockchip, branches master and styhead.

Re: [yocto-patches] [meta-rockchip][PATCH v2 1/4] u-boot: switch to upstream SRCREV for rk-u-boot-env

[Quentin Schulz]

Hi Trevor,

On 12/13/24 4:48 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> When the rk-u-boot-env feature was implemented, in order for it to work the
> build needed a version of U-Boot that was slightly newer than 2024.04 (the
> current release supported by Yocto at that time). Now that 2024.10 is out,
> remove the SRCREV pin since the necessary code is now part of this release.
> 
> Signed-off-by: Trevor Woerner <twoerner@gmail.com>

Patches 1, 2 and 3 are only applicable for master (walnascar). This 
won't work on Styhead. I believe we need to have a branch for Styhead 
now where this won't make it.

Cheers,
Quentin