Hi Trevor,
Looking good :) Thanks for looking into it, will be helpful to me in the
upcoming weeks/months :)
On 9/22/23 04:51, Trevor Woerner via lists.yoctoproject.org wrote:
Add support for the Radxa Rock 5B
https://wiki.radxa.com/Rock5/5b
The device-tree for this board is better in the 6.5 (and later) kernels,
therefore set the kernel to linux-yocto-dev for now (eventually this won't be
needed as linux-yocto moves forward).
The Trusted Firmware A project (TF-A git://git.trustedfirmware.org/TF-A)
does not currently support the rk3588, but patches are in review. For
the time-being we're using the binary DDR/TPL initialization blob from
https://github.com/rockchip-linux/rkbin. Hopefully this can change if/when
TF-A gains support for the rk3588.
Because it's closed source, I cannot tell if DDR binary is based off
TF-A but I would say it's likely not? It's fine like this but not
entirely sure it's true.
The rk3588 comes in two variants: rk3588 and rk3588s. The "s" option is a
stripped-down version of the rk3588. In the Linux kernel these two SoCs are
kept separate, with the rk3588 building on the rk3588s, so we've mimicked that
same behaviour here.
Signed-off-by: Quentin Schulz <[email protected]>
I may have improperly wrote this in the github commit I sent you, but my
professional mail address is:
[email protected]
:)
Signed-off-by: Trevor Woerner <[email protected]>
---
README | 1 +
conf/machine/include/rk3588.inc | 8 ++
conf/machine/include/rk3588s-base.inc | 16 ++++
conf/machine/include/rk3588s.inc | 5 ++
conf/machine/rock5b.conf | 12 +++
recipes-bsp/rkbin/rockchip-rkbin_git.bb | 37 ++++++++
recipes-bsp/u-boot/u-boot%.bbappend | 5 ++
recipes-kernel/linux/linux-yocto-dev.bbappend | 3 +
.../rockchip/remove-non-rockchip-arch-arm.cfg | 85 +++++++++++++++++++
.../rockchip/remove-non-rockchip-arch-arm.scc | 1 +
.../remove-non-rockchip-arch-arm64.cfg | 66 ++++++++++++++
.../remove-non-rockchip-arch-arm64.scc | 1 +
12 files changed, 240 insertions(+)
create mode 100644 conf/machine/include/rk3588.inc
create mode 100644 conf/machine/include/rk3588s-base.inc
create mode 100644 conf/machine/include/rk3588s.inc
create mode 100644 conf/machine/rock5b.conf
create mode 100644 recipes-bsp/rkbin/rockchip-rkbin_git.bb
create mode 100644 recipes-kernel/linux/linux-yocto-dev.bbappend
create mode 100644
recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.cfg
create mode 100644
recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm.scc
create mode 100644
recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.cfg
create mode 100644
recipes-kernel/linux/linux-yocto-dev/rockchip-kmeta/bsp/rockchip/remove-non-rockchip-arch-arm64.scc
diff --git a/README b/README
index 286dafbe1020..032d9bbb6b34 100644
--- a/README
+++ b/README
@@ -30,6 +30,7 @@ Status of supported boards:
vyasa-rk3288
firefly-rk3288
nanopi-r4s
+ rock5b
builds:
marsboard-rk3066
radxarock
diff --git a/conf/machine/include/rk3588.inc b/conf/machine/include/rk3588.inc
new file mode 100644
index 000000000000..d358565a904d
--- /dev/null
+++ b/conf/machine/include/rk3588.inc
@@ -0,0 +1,8 @@
+# the rk3588s is a "stripped-down" version of the rk3588
+# in the kernel's device-tree the rk3588 builds on top of the rk3588s
+# so anything that is valid for the rk3588s is valid for the rk3588
+MACHINEOVERRIDES =. "rk3588:rk3588s:"
This is incorrect, this makes rk3588s have precedence over rk3588, which
is wrong for rk3588-based devices. Why not have MACHINEOVERRIDES for
rk3588s in rk3588s-base.inc instead?
+require conf/machine/include/rk3588s-base.inc
+
+SOC_FAMILY = "rk3588"
+require conf/machine/include/soc-family.inc
The two lines above actually do MACHINEOVERRIDES =. "rk3588"
so we don't need to repeat it.
diff --git a/conf/machine/include/rk3588s-base.inc
b/conf/machine/include/rk3588s-base.inc
new file mode 100644
index 000000000000..ad74a1895ec0
--- /dev/null
+++ b/conf/machine/include/rk3588s-base.inc
@@ -0,0 +1,16 @@
+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/rockchip-wic.inc
+
+KBUILD_DEFCONFIG ?= "defconfig"
+KERNEL_FEATURES:append:rk3588 = "
bsp/rockchip/remove-non-rockchip-arch-arm64.scc"
+KERNEL_CLASSES = "kernel-fitimage"
+KERNEL_IMAGETYPE = "fitImage"
+
+PREFERRED_PROVIDER_trusted-firmware-a = "rockchip-rkbin"
+PREFERRED_PROVIDER_optee-os = "rockchip-rkbin"
+
+UBOOT_SUFFIX ?= "itb"
+UBOOT_ENTRYPOINT ?= "0x06000000"
diff --git a/conf/machine/include/rk3588s.inc b/conf/machine/include/rk3588s.inc
new file mode 100644
index 000000000000..a57be507bf5e
--- /dev/null
+++ b/conf/machine/include/rk3588s.inc
@@ -0,0 +1,5 @@
+MACHINEOVERRIDES =. "rk3588s:"
Maybe we could move this directly to the -base.inc so we don't add it in
rk3588.inc and rk3588s.inc?
To verify the MACHINEOVERRIDES is correct, I highly suggest to run:
"""
bitbake-getvar MACHINEOVERRIDES
"""
this variable is read from right to left, with the highest precedence on
the right side.
So we should have something like:
"""
aarch64:rk3588s:rk3588:rock5b
aarch64:rk3588s:orangepi5
"""
for example.
Now also wondering if we shouldn't add "rockchip" to MACHINEOVERRIDES,
which would make things a bit easier for COMPATIBLE_MACHINE in
rockchip-rkbin (though not really useful).
+require conf/machine/include/rk3588s-base.inc
+
+SOC_FAMILY = "rk3588s"
+require conf/machine/include/soc-family.inc
diff --git a/conf/machine/rock5b.conf b/conf/machine/rock5b.conf
new file mode 100644
index 000000000000..dc31a9f3a4e4
--- /dev/null
+++ b/conf/machine/rock5b.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Radxa Rock5b
+#@DESCRIPTION: ROCK5 is the 5th generation of SBC designed by Radxa.
+#https://wiki.radxa.com/Rock5/5b
+
+require conf/machine/include/rk3588.inc
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-dev"
+KERNEL_DEVICETREE = "rockchip/rk3588-rock-5b.dtb"
+MACHINE_EXTRA_RRECOMMENDS += "kernel-modules"
+
+UBOOT_MACHINE = "rock5b-rk3588_defconfig"
diff --git a/recipes-bsp/rkbin/rockchip-rkbin_git.bb
b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
new file mode 100644
index 000000000000..7fefb017053b
--- /dev/null
+++ b/recipes-bsp/rkbin/rockchip-rkbin_git.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "Rockchip Firmware and Tool Binaries"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62"
+
+SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master"
+SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23"
+
+PROVIDES += "trusted-firmware-a"
+PROVIDES += "optee-os"
+
+inherit bin_package deploy
+
+S = "${WORKDIR}/git"
+
+COMPATIBLE_MACHINE = ""
+COMPATIBLE_MACHINE:rk3588s = "rk3588s"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+do_install() {
+ # Nothing in this recipe is useful in a filesystem
+ :
+}
+
+PACKAGES = "${PN}"
+ALLOW_EMPTY:${PN} = "1"
+
+do_deploy() {
+ # 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_2736MHz_v*.bin
${DEPLOYDIR}/ddr-rk3588.bin
+}
+ > +addtask deploy after do_install
Regarding the topic of adding support for more SoCs you brought up on
IRC, we either need to have multiple deploy, e.g.
"""
do_deploy:rk3588s() {
install ...
}
do_deploy:rk3308() {
install ...
}
do_deploy() {
# Required because addtask needs to be able to run regardless of
COMPATIBLE_MACHINE I believe?
:
}
"""
or abstract the paths to instlal in variables, e.g.
"""
RKBIN_BL31:rk3588s = "rk35/rk3588_bl31_v*.elf"
RKBIN_BL31_INSTALLED:rk3588s = "bl31-rk3588.elf"
RKBIN_BL31:rk3308 = "rk33/rk3308_bl31_v*.elf"
RKBIN_BL31_INSTALLED:rk3308 = "bl31-rk3308.elf"
RKBIN_BL32:rk3588s = "rk35/rk3588_bl32_v*.bin"
RKBIN_BL32_INSTALLED:rk3588s = "tee-rk3588.bin"
RKBIN_BL32:rk3308 = "rk33/rk3308_bl32_v*.bin"
RKBIN_BL32_INSTALLED:rk3308 = "tee-rk3308.bin"
RKBIN_DDR:rk3588s = "rk35/rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin"
RKBIN_DDR_INSTALLED:rk3588s = "ddr-rk3588.bin"
RKBIN_DDR:rk3308 = "rk33/rk3308_ddr_589MHz_uart4_m0_v*.bin"
RKBIN_DDR_INSTALLED:rk3308 = "ddr-rk3308.bin"
do_deploy() {
# Prebuilt TF-A
install -m 644 ${S}/bin/${RKBIN_BL31}
${DEPLOYDIR}/${RKBIN_BL31_INSTALLED}
# Prebuilt OPTEE-OS
install -m 644 ${S}/bin/${RKBIN_BL32}
${DEPLOYDIR}/${RKBIN_BL32_INSTALLED}
# Prebuilt U-Boot TPL (DDR init)
install -m 644 ${S}/bin/${RKBIN_DDR} ${DEPLOYDIR}/${RKBIN_DDR_INSTALLED}
}
"""
we could also simplify it by doing some educated guess:
"""
# In rkbin, rk3588s uses rk3588-prefixed binaries
SOC_FAMILY:rk3588s = "rk3588"
SHORT_SOC_FAMILY = "${@d.getVar("SOC_FAMILY")[:2]}"
RKBIN_BL31 = "${SHORT_SOC_FAMILY}/${SOC_FAMILY}_bl31_v*.elf"
RKBIN_BL31_INSTALLED = "bl31-${SOC_FAMILY}.elf"
RKBIN_BL32 = "${SHORT_SOC_FAMILY}/${SOC_FAMILY}_bl32_v*.bin"
RKBIN_BL32_INSTALLED = "tee-${SOC_FAMILY}.bin"
RKBIN_DDR_INSTALLED = "ddr-${SOC_FAMILY}.bin"
# We only want one match of this glob and they are difficult to guess
based on SoC only
RKBIN_DDR:rk3308 = "rk3308_ddr_589MHz_uart4_m0_v*.bin"
RKBIN_DDR:rk3588s = "rk3588_ddr_lp4_2112MHz_lp5_2736MHz_v*.bin"
do_deploy() {
# Prebuilt TF-A
install -m 644 ${S}/bin/${SHORT_SOC_FAMILY}/${RKBIN_BL31}
${DEPLOYDIR}/${RKBIN_BL31_INSTALLED}
# Prebuilt OPTEE-OS
install -m 644 ${S}/bin/${SHORT_SOC_FAMILY}/${RKBIN_BL32}
${DEPLOYDIR}/${RKBIN_BL32_INSTALLED}
# Prebuilt U-Boot TPL (DDR init)
install -m 644 ${S}/bin/${SHORT_SOC_FAMILY}/${RKBIN_DDR}
${DEPLOYDIR}/${RKBIN_DDR_INSTALLED}
}
"""
Cheers,
Quentin
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#61079): https://lists.yoctoproject.org/g/yocto/message/61079
Mute This Topic: https://lists.yoctoproject.org/mt/101514536/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
