[meta-rockchip PATCH scarthgap 0/3] bsp: rkbin: bump to latest commit in master

[meta-rockchip PATCH scarthgap 0/3] bsp: rkbin: bump to latest commit in master

[Quentin Schulz]

Backport patches from master to scarthgap branch.

A choice was made to not backport the splitting of op-tee, tf-a and
ddr-bin in their own recipes as it would break users of meta-rockchip if
they bbappend the recipe. This will make backporting increasingly more
difficult so maybe we could revisit this decision at some point.

Build and run tested on RK3588 Jaguar.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
Quentin Schulz (3):
      bsp: rkbin: do not add default DEPENDS dependencies
      bsp: rkbin: use version and file variables for path matching the DDR init binary
      bsp: rkbin: bump to latest commit in master branch

 README                                  | 15 +++++++++++++++
 recipes-bsp/rkbin/rockchip-rkbin_git.bb | 26 ++++++++++++++++++++------
 2 files changed, 35 insertions(+), 6 deletions(-)
---
base-commit: e641dba980efa885df7e992ac5c8783270aa375d
change-id: 20241216-rkbin-bump-scarthgap-03e1a8343005

Best regards,
-- 
Quentin Schulz <quentin.schulz@cherry.de>

[meta-rockchip PATCH scarthgap 1/3] bsp: rkbin: do not add default DEPENDS dependencies

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

Nothing needs to be done for rkbin recipes except taking a file and
putting in do_deploy, therefore there's no need for the default typical
DEPENDS dependencies to be pulled in. As such, set INHIBIT_DEFAULT_DEPS
to avoid having them pulled in.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
(cherry picked from commit 60354969f0c621f1dc775e7fcd2ad0f3fe8975f8)
[apply on rockchip-rkbin_git.bb instead of rockchip-rkbin.inc]
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 recipes-bsp/rkbin/rockchip-rkbin_git.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
index 1b71414e27ca781d9a8a551a9272fb596debb34d..6e87507e3983710fa1e0a2db5d83e9e2a20d9ced 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -10,6 +10,8 @@ PROVIDES += "optee-os"
 
 inherit bin_package deploy
 
+INHIBIT_DEFAULT_DEPS = "1"
+
 S = "${WORKDIR}/git"
 
 COMPATIBLE_MACHINE = "^$"

-- 
2.47.1

[meta-rockchip PATCH scarthgap 2/3] bsp: rkbin: use version and file variables for path matching the DDR init binary

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

By using variables to give the path where to find the file to install,
it is easier for users to have a different SRCREV for their own machine.

Additionally, because glob patterns are now not used by default, it is
guaranteed only to match a single file.

The glob pattern for rk3308 has been hardcoded with the only file that
matches in the rkbin git repository at the currently used commit.

Reviewed-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
(cherry picked from commit ca38f7cea5a6dc50cba46459741564961f55485f)
[apply to rockchip-rkbin_git.bb instead of rockchip-rkbin.inc]
[reword commit title]
[reword README]
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 README                                  | 15 +++++++++++++++
 recipes-bsp/rkbin/rockchip-rkbin_git.bb | 20 ++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 09f8691300f4385342022c0de4d0fa10b121a494..6f5866bdf1f503ddc06fcc31d16275fe68986959 100644
--- a/README
+++ b/README
@@ -54,6 +54,21 @@ Status of supported boards:
 
 Notes:
 -----
+  Custom rkbin version:
+	If you wish to use a different version of DDR binary provided by
+	rockchip-rkbin recipe than the one in this layer, you can create a
+	.bbappend in your own layer, and accordingly set SRCREV (possibly
+	LIC_FILES_CHKSUM too) and the version for path matching stored in
+	DDRBIN_VERS variable. Do so in your .bbappend with:
+
+		DDRBIN_VERS:my-machine = "v2.07"
+
+	If somehow the filename differs from the one provided in this layer, you
+	can override it from your bbappend with the DDRBIN_FILE variable:
+
+		DDRBIN_VERS:my-machine = "v2.07"
+		DDRBIN_FILE:my-machine = "rk3308_ddr_451MHz_uart4_m0_${DDRBIN_VERS}.bin"
+
   rk3308 rkbin:
 	The latest ddr initializer for the rk3308 platform does not output
 	diagnostic messages to uart0. This causes a bunch of gibberish to
diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
index 6e87507e3983710fa1e0a2db5d83e9e2a20d9ced..f13c134604a10384793c92632e150eb0aaa4cd8e 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -30,15 +30,21 @@ do_install() {
 PACKAGES = "${PN}"
 ALLOW_EMPTY:${PN} = "1"
 
+DDRBIN_VERS:rk3308 ?= "v2.07"
+DDRBIN_FILE:rk3308 ?= "rk3308_ddr_589MHz_uart4_m0_${DDRBIN_VERS}.bin"
+
 do_deploy:rk3308() {
 	# Prebuilt TF-A
 	install -m 644 ${S}/bin/rk33/rk3308_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3308.elf
 	# Prebuilt OPTEE-OS
 	install -m 644 ${S}/bin/rk33/rk3308_bl32_v*.bin ${DEPLOYDIR}/tee-rk3308.bin
 	# Prebuilt U-Boot TPL (DDR init)
-	install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart?_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin
+	install -m 644 ${S}/bin/rk33/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3308.bin
 }
 
+DDRBIN_VERS:rk3566 ?= "v1.21"
+DDRBIN_FILE:rk3566 ?= "rk3566_ddr_1056MHz_${DDRBIN_VERS}.bin"
+
 # NOTE: the following are not typos
 #       the rk3566 uses the same bl31/2 as the rk3568
 do_deploy:rk3566() {
@@ -47,25 +53,31 @@ do_deploy:rk3566() {
 	# Prebuilt OPTEE-OS
 	install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin ${DEPLOYDIR}/tee-rk3566.bin
 	# Prebuilt U-Boot TPL (DDR init)
-	install -m 644 ${S}/bin/rk35/rk3566_ddr_1056MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3566.bin
+	install -m 644 ${S}/bin/rk35/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3566.bin
 }
 
+DDRBIN_VERS:rk3568 ?= "v1.21"
+DDRBIN_FILE:rk3568 ?= "rk3568_ddr_1560MHz_${DDRBIN_VERS}.bin"
+
 do_deploy:rk3568() {
 	# Prebuilt TF-A
 	install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elf
 	# Prebuilt OPTEE-OS
 	install -m 644 ${S}/bin/rk35/rk3568_bl32_v*.bin ${DEPLOYDIR}/tee-rk3568.bin
 	# Prebuilt U-Boot TPL (DDR init)
-	install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3568.bin
+	install -m 644 ${S}/bin/rk35/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3568.bin
 }
 
+DDRBIN_VERS:rk3588s ?= "v1.16"
+DDRBIN_FILE:rk3588s ?= "rk3588_ddr_lp4_2112MHz_lp5_2400MHz_${DDRBIN_VERS}.bin"
+
 do_deploy:rk3588s() {
 	# Prebuilt TF-A
 	install -m 644 ${S}/bin/rk35/rk3588_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3588.elf
 	# Prebuilt OPTEE-OS
 	install -m 644 ${S}/bin/rk35/rk3588_bl32_v*.bin ${DEPLOYDIR}/tee-rk3588.bin
 	# Prebuilt U-Boot TPL (DDR init)
-	install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin ${DEPLOYDIR}/ddr-rk3588.bin
+	install -m 644 ${S}/bin/rk35/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3588.bin
 }
 
 do_deploy() {

-- 
2.47.1

[meta-rockchip PATCH scarthgap 3/3] bsp: rkbin: bump to latest commit in master branch

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

This seems to be fixing random RCU stalls, system hangs or resets while
running upstream Linux kernel on RK3588 boards.

License-Update: Fixing typos c.f. 385bf9f1700c ("license: typo fix")

Before and after run-tested on:
	rk3308  rock-pi-s (with and without RKBIN_RK3308_LATEST)
	rk3566  radxa-zero-3e
	rk3568  rock-3a
	rk3588  rock-5a
	rk3588s rock-5b

Run-tested-by: Trevor Woerner <twoerner@gmail.com>

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
(cherry picked from commit 80d4039b1b275471148e83627df25700fd6758bd)
[apply to rockchip-rkbin_git.bb instead of rockchip-rkbin.inc]
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 recipes-bsp/rkbin/rockchip-rkbin_git.bb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
index f13c134604a10384793c92632e150eb0aaa4cd8e..e555dcdac355ca862e6421b5b26f2f7c5c92ee14 100644
--- a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Rockchip Firmware and Tool Binaries"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=11e3673115959bf596feaaa6ea7ce9a5"
 
 SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master"
-SRCREV = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0"
+SRCREV = "7c35e21a8529b3758d1f051d1a5dc62aae934b2b"
 
 PROVIDES += "trusted-firmware-a"
 PROVIDES += "optee-os"
@@ -30,7 +30,7 @@ do_install() {
 PACKAGES = "${PN}"
 ALLOW_EMPTY:${PN} = "1"
 
-DDRBIN_VERS:rk3308 ?= "v2.07"
+DDRBIN_VERS:rk3308 ?= "v2.10"
 DDRBIN_FILE:rk3308 ?= "rk3308_ddr_589MHz_uart4_m0_${DDRBIN_VERS}.bin"
 
 do_deploy:rk3308() {
@@ -42,7 +42,7 @@ do_deploy:rk3308() {
 	install -m 644 ${S}/bin/rk33/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3308.bin
 }
 
-DDRBIN_VERS:rk3566 ?= "v1.21"
+DDRBIN_VERS:rk3566 ?= "v1.23"
 DDRBIN_FILE:rk3566 ?= "rk3566_ddr_1056MHz_${DDRBIN_VERS}.bin"
 
 # NOTE: the following are not typos
@@ -56,7 +56,7 @@ do_deploy:rk3566() {
 	install -m 644 ${S}/bin/rk35/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3566.bin
 }
 
-DDRBIN_VERS:rk3568 ?= "v1.21"
+DDRBIN_VERS:rk3568 ?= "v1.23"
 DDRBIN_FILE:rk3568 ?= "rk3568_ddr_1560MHz_${DDRBIN_VERS}.bin"
 
 do_deploy:rk3568() {
@@ -68,7 +68,7 @@ do_deploy:rk3568() {
 	install -m 644 ${S}/bin/rk35/${DDRBIN_FILE} ${DEPLOYDIR}/ddr-rk3568.bin
 }
 
-DDRBIN_VERS:rk3588s ?= "v1.16"
+DDRBIN_VERS:rk3588s ?= "v1.18"
 DDRBIN_FILE:rk3588s ?= "rk3588_ddr_lp4_2112MHz_lp5_2400MHz_${DDRBIN_VERS}.bin"
 
 do_deploy:rk3588s() {

-- 
2.47.1

Re: [meta-rockchip PATCH scarthgap 0/3] bsp: rkbin: bump to latest commit in master

[Trevor Woerner]

On Mon 2024-12-16 @ 02:39:46 PM, Quentin Schulz wrote:
> Backport patches from master to scarthgap branch.
> 
> A choice was made to not backport the splitting of op-tee, tf-a and
> ddr-bin in their own recipes as it would break users of meta-rockchip if
> they bbappend the recipe. This will make backporting increasingly more
> difficult so maybe we could revisit this decision at some point.
> 
> Build and run tested on RK3588 Jaguar.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
> Quentin Schulz (3):
>       bsp: rkbin: do not add default DEPENDS dependencies
>       bsp: rkbin: use version and file variables for path matching the DDR init binary
>       bsp: rkbin: bump to latest commit in master branch
> 
>  README                                  | 15 +++++++++++++++
>  recipes-bsp/rkbin/rockchip-rkbin_git.bb | 26 ++++++++++++++++++++------
>  2 files changed, 35 insertions(+), 6 deletions(-)
> ---
> base-commit: e641dba980efa885df7e992ac5c8783270aa375d
> change-id: 20241216-rkbin-bump-scarthgap-03e1a8343005
> 
> Best regards,
> -- 
> Quentin Schulz <quentin.schulz@cherry.de>

Applied to meta-rockchip, scarthgap branch. Thanks!