radxa-zero-3e: add
PATCH 1/1 radxa-zero-3e: add
The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces.
http://radxa.com/products/zeros/zero3e/
tech specs:
- Rockchip RK3566 (4x Arm Cortex-A55 @ 1.6GHz)
- Arm Mali-G52-2EE (OpenGL ES 1.1/2.0/3.0/3.1/3.2, Vulkan 1.1, OpenCL 2.0)
- LPDDR4 RAM (1/2/3/8 GB)
- µSD
- GbE
- 1x USB 2.0 Type C OTG, 1x USB 3.0 Type C Host
- 1x µHDMI (1080p @ 60fps)
- 1x MIPI CSI camera port
- colour-coded 40-pin GPIO (uart, spi, i2c, pcm/i2s, pwm, gpio)
- 72mm x 30mm
NOTE: currently support for this board requires a U-Boot fork for the bootloader, and linux-next for the kernel. Support will probably come in linux kernel 6.11-ish, at which point U-Boot will then use that kernel's device tree which means U-Boot support will come after the release of whichever kernel includes support for this board.
--- README | 1 + conf/machine/include/rk3566.inc | 21 ++++++++++++++++++ conf/machine/radxa-zero-3e.conf | 12 ++++++++++ recipes-bsp/rkbin/rockchip-rkbin_git.bb | 11 ++++++++++ recipes-bsp/u-boot/u-boot-rockchip.inc | 2 ++ recipes-bsp/u-boot/u-boot_%.bbappend | 5 +++++ .../linux/linux-torvalds-next_git.bb | 22 +++++++++++++++++++ 7 files changed, 74 insertions(+) create mode 100644 conf/machine/include/rk3566.inc create mode 100644 conf/machine/radxa-zero-3e.conf create mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bb
README +1 -0
@@ -40,6 +40,7 @@ Status of supported boards: orangepi-5-plus rock-3a rock-4c-plus + radxa-zero-3e builds: marsboard-rk3066 radxarock
conf/machine/include/rk3566.inc new file +21 -0
@@ -0,0 +1,21 @@ +SOC_FAMILY = "rk3566" + +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 +require conf/machine/include/rockchip-wic.inc + +KBUILD_DEFCONFIG ?= "defconfig" +#KERNEL_FEATURES:append:rk3566 = " 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"
conf/machine/radxa-zero-3e.conf new file +12 -0
@@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3E +#@DESCRIPTION: The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. +#http://radxa.com/products/zeros/zero3e/ + +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
recipes-bsp/rkbin/rockchip-rkbin_git.bb +11 -0
@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" +SRCREV:radxa-zero-3e = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0" PROVIDES += "trusted-firmware-a" PROVIDES += "optee-os"
@@ -15,6 +16,7 @@ S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:rk3308 = "rk3308" COMPATIBLE_MACHINE:rk3568 = "rk3568" +COMPATIBLE_MACHINE:rk3566 = "rk3566" COMPATIBLE_MACHINE:rk3588s = "rk3588s" PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -36,6 +38,15 @@ do_deploy:rk3308() { install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart?_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin } +do_deploy:rk3566() { + # 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/rk3566_ddr_1056MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3566.bin +} + do_deploy:rk3568() { # Prebuilt TF-A install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elf
recipes-bsp/u-boot/u-boot-rockchip.inc +2 -0
@@ -1,6 +1,8 @@ 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" +# rk3566 uses the rk3568 bl31 +BL31:rk3566 = "${DEPLOY_DIR_IMAGE}/bl31-rk3568.elf" EXTRA_OEMAKE:append:rockchip:aarch64 = " BL31=${BL31}" TFA_DEPENDS ??= ""
recipes-bsp/u-boot/u-boot_%.bbappend +5 -0
@@ -2,6 +2,11 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:radxa-zero-3e = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo" +SRC_URI[Kwiboo.sha256sum] = "5d102a658262f6d2d4ea0664fe58b77db4a9eb1ebc89dbd8d6f5e75c9e563810" +SRCREV:radxa-zero-3e = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRCREV:radxa-zero-3e:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" + SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a"
recipes-kernel/linux/linux-torvalds-next_git.bb new file +22 -0
@@ -0,0 +1,22 @@ +inherit kernel +inherit kernel-yocto +require recipes-kernel/linux/linux-yocto.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + + +LINUX_VERSION = "6.10" +KERNEL_VERSION_SANITY_SKIP = "1" +SRCREV = "next-20240611" +PV = "${LINUX_VERSION}+git${SRCPV}" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" +SRC_URI[sha256sum] = "3a1c433c4ceffa52f8c3df3aab8c379ff91ca658021d409a528825e5e24580f4" + +do_compile:append() { + touch ${B}/Module.symvers +}
Signature · 1 line
2.44.0.478.g7774cfed6261
Hi Trevor,
Quoted 17 lines · Trevor Woerner via lists.yoctoproject.org
The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces.
http://radxa.com/products/zeros/zero3e/
tech specs:
- Rockchip RK3566 (4x Arm Cortex-A55 @ 1.6GHz)
- Arm Mali-G52-2EE (OpenGL ES 1.1/2.0/3.0/3.1/3.2, Vulkan 1.1, OpenCL 2.0)
- LPDDR4 RAM (1/2/3/8 GB)
- µSD
- GbE
- 1x USB 2.0 Type C OTG, 1x USB 3.0 Type C Host
- 1x µHDMI (1080p @ 60fps)
- 1x MIPI CSI camera port
- colour-coded 40-pin GPIO (uart, spi, i2c, pcm/i2s, pwm, gpio)
- 72mm x 30mm
Quoted 6 lines
NOTE: currently support for this board requires a U-Boot fork for the bootloader, and linux-next for the kernel. Support will probably come in linux kernel 6.11-ish, at which point U-Boot will then use that kernel's device tree which means U-Boot support will come after the release of whichever kernel includes support for this board.
Jonas has added support for generic builds for some Rockchip SoCs, maybe you could use that if it provides enough features for now and allows to reach Linux userspace?
The target is probably generic-rk3568_defconfig for this board for example.
Quoted 31 lines
Signed-off-by Trevor Woerner <[email protected]>--- README | 1 + conf/machine/include/rk3566.inc | 21 ++++++++++++++++++ conf/machine/radxa-zero-3e.conf | 12 ++++++++++ recipes-bsp/rkbin/rockchip-rkbin_git.bb | 11 ++++++++++ recipes-bsp/u-boot/u-boot-rockchip.inc | 2 ++ recipes-bsp/u-boot/u-boot_%.bbappend | 5 +++++ .../linux/linux-torvalds-next_git.bb | 22 +++++++++++++++++++ 7 files changed, 74 insertions(+)create mode 100644 conf/machine/include/rk3566.inc create mode 100644
conf/machine/radxa-zero-3e.confcreate mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bbREADME +1
-0@@ -40,6 +40,7 @@ Status of supported boards: orangepi-5-plus rock-3a rock-4c-plus + radxa-zero-3e builds: marsboard-rk3066 radxarockconf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@ new file +0
-0
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@
Quoted 7 lines
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@ new file +7
-0+SOC_FAMILY = "rk3566" + +DEFAULTTUNE ?= "cortexa55" + +ROCKCHIP_CLOSED_TPL ?= "1" + +require conf/machine/include/soc-family.inc
I think the RK3566 is a stripped down version of the RK3568 and the common parts are handled by rk356x.dtsi for example.
I'm wondering if we should have the same trick we have for rk3588s and rk3588 to have a common override to not have to maintain variable/function overrides for both SoCs?
EDIT: seems like there's a different DDR bin for RK3566 and RK3568, make it make sense. Probably because the RK3568 seems to be able to support ECC on DDR4?
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@
Quoted 6 lines
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@ new file +6
-0+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" +#KERNEL_FEATURES:append:rk3566 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc"
Did you mean to keep this comment here?
Quoted 31 lines
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@ new file +8
-0+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"conf/machine/radxa-zero-3e.conf new file +12
-0@@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3E +#@DESCRIPTION: The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. +#http://radxa.com/products/zeros/zero3e/ + +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"recipes-bsp/rkbin/rockchip-rkbin_git.bb +0
-0
recipes-bsp/rkbin/rockchip-rkbin_git.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" · line 8
Quoted 5 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +1
-0@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" +SRCREV:radxa-zero-3e = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0"
Why not bump the whole rockchip-rkbin recipe? Also is there a reason for bumping it? I already see rk3566 blobs in the current git commit. Not against bumping it, would be nice to explain if there's a reason for it other than "newer is better" (which I am a proponent of :) ).
recipes-bsp/rkbin/rockchip-rkbin_git.bb S = "${WORKDIR}/git" · line 19
Quoted 7 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +1
-0PROVIDES += "trusted-firmware-a" PROVIDES += "optee-os"@@ -15,6 +16,7 @@ S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:rk3308 = "rk3308" COMPATIBLE_MACHINE:rk3568 = "rk3568" +COMPATIBLE_MACHINE:rk3566 = "rk3566"
Maybe order alphabetically here?
Quoted 4 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +0
-0COMPATIBLE_MACHINE:rk3588s = "rk3588s" PACKAGE_ARCH = "${MACHINE_ARCH}"
recipes-bsp/rkbin/rockchip-rkbin_git.bb do_deploy:rk3308() { · line 47
Quoted 10 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +7
-0@@ -36,6 +38,15 @@ do_deploy:rk3308() { install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart?_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin } +do_deploy:rk3566() { + # 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/rk3566_ddr_1056MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3566.bin
Sigh... Rockchip, almost the same SoC but different DRAM init.
You could also decide to rename the bl31 and tee to use rk3566 in there to avoid adding custom handling in other recipes. Not sure this obfuscation is good though.
Quoted 10 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +2
-0+} + do_deploy:rk3568() { # Prebuilt TF-A install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elfrecipes-bsp/u-boot/u-boot-rockchip.inc +0
-0
recipes-bsp/u-boot/u-boot-rockchip.inc line 5
Quoted 5 lines
recipes-bsp/u-boot/u-boot-rockchip.inc +2
-0@@ -1,6 +1,8 @@ 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" +# rk3566 uses the rk3568 bl31 +BL31:rk3566 = "${DEPLOY_DIR_IMAGE}/bl31-rk3568.elf"
Order alphabetically maybe here?
Quoted 8 lines
recipes-bsp/u-boot/u-boot-rockchip.inc +0
-0EXTRA_OEMAKE:append:rockchip:aarch64 = " BL31=${BL31}" TFA_DEPENDS ??= ""recipes-bsp/u-boot/u-boot_%.bbappend +0
-0
recipes-bsp/u-boot/u-boot_%.bbappend require u-boot-rockchip.inc · line 9
Quoted 8 lines
recipes-bsp/u-boot/u-boot_%.bbappend +5
-0@@ -2,6 +2,11 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:radxa-zero-3e = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo" +SRC_URI[Kwiboo.sha256sum] = "5d102a658262f6d2d4ea0664fe58b77db4a9eb1ebc89dbd8d6f5e75c9e563810" +SRCREV:radxa-zero-3e = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRCREV:radxa-zero-3e:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +
I think a separate recipe here is wiser? They are essentially different sources from a different repo. Although, maybe the generic target is good enough in which case we wouldn't need that at all?
Quoted 9 lines
recipes-bsp/u-boot/u-boot_%.bbappend +0
-0SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a"recipes-kernel/linux/linux-torvalds-next_git.bb new file +0
-0
recipes-kernel/linux/linux-torvalds-next_git.bb line 9
Quoted 9 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +9
-0@@ -0,0 +1,22 @@ +inherit kernel +inherit kernel-yocto +require recipes-kernel/linux/linux-yocto.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPLv2"
Deprecated, should be
GPL-2.0-only
recipes-kernel/linux/linux-torvalds-next_git.bb line 11
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +
This is usually at the top of the recipe?
recipes-kernel/linux/linux-torvalds-next_git.bb line 13
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+ +LINUX_VERSION = "6.10"
Isn't it supposed to be 6.11?
I would recommend puttingDEFAULT_PREFERENCE = "-1"
to make sure it isn't mistakenly pulled implicitly.
Maybe even add a COMPATIBLE_MACHINE only for this new board?
recipes-kernel/linux/linux-torvalds-next_git.bb line 15
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+KERNEL_VERSION_SANITY_SKIP = "1" +SRCREV = "next-20240611"
Please use commit hashes and not tags
recipes-kernel/linux/linux-torvalds-next_git.bb line 19
Quoted 4 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +4
-0+PV = "${LINUX_VERSION}+git${SRCPV}" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" +SRC_URI[sha256sum] = "3a1c433c4ceffa52f8c3df3aab8c379ff91ca658021d409a528825e5e24580f4" +
Is this actually used by Bitbake? It's fetching code through HTTPS via git and git should handle all the integrity there?
recipes-kernel/linux/linux-torvalds-next_git.bb line 22
Quoted 3 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +3
-0+do_compile:append() { + touch ${B}/Module.symvers +}
That seems odd, can you add a comment on why this is required?
Cheers,
Quentin
Quoted 27 lines · Quentin Schulz via lists.yoctoproject.org
Hi Trevor,
Quoted 17 lines · Trevor Woerner via lists.yoctoproject.org
The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces.
http://radxa.com/products/zeros/zero3e/
tech specs:
- Rockchip RK3566 (4x Arm Cortex-A55 @ 1.6GHz)
- Arm Mali-G52-2EE (OpenGL ES 1.1/2.0/3.0/3.1/3.2, Vulkan 1.1, OpenCL 2.0)
- LPDDR4 RAM (1/2/3/8 GB)
- µSD
- GbE
- 1x USB 2.0 Type C OTG, 1x USB 3.0 Type C Host
- 1x µHDMI (1080p @ 60fps)
- 1x MIPI CSI camera port
- colour-coded 40-pin GPIO (uart, spi, i2c, pcm/i2s, pwm, gpio)
- 72mm x 30mmQuoted 6 lines
NOTE: currently support for this board requires a U-Boot fork for the bootloader, and linux-next for the kernel. Support will probably come in linux kernel 6.11-ish, at which point U-Boot will then use that kernel's device tree which means U-Boot support will come after the release of whichever kernel includes support for this board.
Quoted 5 lines
Jonas has added support for generic builds for some Rockchip SoCs, maybe you could use that if it provides enough features for now and allows to reach Linux userspace?
The target is probably generic-rk3568_defconfig for this board for example.
Sounds interesting, I'll take a look.
Quoted 50 lines
Quoted 31 lines
Signed-off-by Trevor Woerner <[email protected]>--- README | 1 + conf/machine/include/rk3566.inc | 21 ++++++++++++++++++ conf/machine/radxa-zero-3e.conf | 12 ++++++++++ recipes-bsp/rkbin/rockchip-rkbin_git.bb | 11 ++++++++++ recipes-bsp/u-boot/u-boot-rockchip.inc | 2 ++ recipes-bsp/u-boot/u-boot_%.bbappend | 5 +++++ .../linux/linux-torvalds-next_git.bb | 22 +++++++++++++++++++ 7 files changed, 74 insertions(+)create mode 100644 conf/machine/include/rk3566.inc create mode 100644
conf/machine/radxa-zero-3e.confcreate mode 100644 recipes-kernel/linux/linux-torvalds-next_git.bbREADME +1
-0@@ -40,6 +40,7 @@ Status of supported boards: orangepi-5-plus rock-3a rock-4c-plus + radxa-zero-3e builds: marsboard-rk3066 radxarockconf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@ new file +0
-0conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@
Quoted 7 lines
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@ new file +7
-0+SOC_FAMILY = "rk3566" + +DEFAULTTUNE ?= "cortexa55" + +ROCKCHIP_CLOSED_TPL ?= "1" + +require conf/machine/include/soc-family.incI think the RK3566 is a stripped down version of the RK3568 and the common parts are handled by
rk356x.dtsifor example.I'm wondering if we should have the same trick we have for rk3588s and rk3588 to have a common override to not have to maintain variable/function overrides for both SoCs?
EDIT: seems like there's a different DDR bin for RK3566 and RK3568, make it make sense. Probably because the RK3568 seems to be able to support ECC on DDR4?
Quoted 8 lines
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@
Quoted 6 lines
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@ new file +6
-0+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" +#KERNEL_FEATURES:append:rk3566 = " bsp/rockchip/remove-non-rockchip-arch-arm64.scc"Did you mean to keep this comment here?
I was so excited about it working I wasn't very careful. I actually want to uncomment the line and add the required bits to make this work.
Quoted 31 lines
Quoted 31 lines
conf/machine/include/rk3566.inc > @@ -0,0 +1,21 @@ new file +8
-0+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"conf/machine/radxa-zero-3e.conf new file +12
-0@@ -0,0 +1,12 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3E +#@DESCRIPTION: The Radxa ZERO 3e is an ultra-small, high-performance single board computer based on the Rockchip RK3566, with a compact form factor, and rich interfaces. +#http://radxa.com/products/zeros/zero3e/ + +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"recipes-bsp/rkbin/rockchip-rkbin_git.bb +0
-0@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62"
Quoted 8 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" · line 7
Quoted 3 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +1
-0SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" +SRCREV:radxa-zero-3e = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0"Why not bump the whole rockchip-rkbin recipe? Also is there a reason for bumping it? I already see rk3566 blobs in the current git commit. Not against bumping it, would be nice to explain if there's a reason for it other than "newer is better" (which I am a proponent of :) ).
We've seen cases where newer wasn't better. The newer blobs for rk3308, for example, took away the ability to read the console during this phase. Playing it safe I decided to just bump it for the new device and leave the rest the same.
I'll bump it for all, but I'll have to test on all the ones I care about before submitting.
Quoted 9 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb S = "${WORKDIR}/git" · line 19
Quoted 7 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +1
-0PROVIDES += "trusted-firmware-a" PROVIDES += "optee-os"@@ -15,6 +16,7 @@ S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:rk3308 = "rk3308" COMPATIBLE_MACHINE:rk3568 = "rk3568" +COMPATIBLE_MACHINE:rk3566 = "rk3566"Maybe order alphabetically here?
Oops, yes.
Quoted 15 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb do_deploy:rk3308() { · line 46
Quoted 12 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +7
-0COMPATIBLE_MACHINE:rk3588s = "rk3588s" PACKAGE_ARCH = "${MACHINE_ARCH}"@@ -36,6 +38,15 @@ do_deploy:rk3308() { install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart?_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin } +do_deploy:rk3566() { + # 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/rk3566_ddr_1056MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3566.binSigh... Rockchip, almost the same SoC but different DRAM init.
Quoted 3 lines
You could also decide to rename the bl31 and tee to use rk3566 in there to avoid adding custom handling in other recipes. Not sure this obfuscation is good though.
I'll look at that.
Quoted 9 lines
Quoted 9 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +2
-0+} + do_deploy:rk3568() { # Prebuilt TF-A install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elfrecipes-bsp/u-boot/u-boot-rockchip.inc +0
-0
Quoted 8 lines
recipes-bsp/u-boot/u-boot-rockchip.inc line 5
Quoted 6 lines
recipes-bsp/u-boot/u-boot-rockchip.inc +2
-0@@ -1,6 +1,8 @@ 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" +# rk3566 uses the rk3568 bl31 +BL31:rk3566 = "${DEPLOY_DIR_IMAGE}/bl31-rk3568.elf"Order alphabetically maybe here?
Oops.
Quoted 9 lines
Quoted 9 lines
recipes-bsp/u-boot/u-boot-rockchip.inc +0
-0EXTRA_OEMAKE:append:rockchip:aarch64 = " BL31=${BL31}" TFA_DEPENDS ??= ""recipes-bsp/u-boot/u-boot_%.bbappend +1
-0@@ -2,6 +2,11 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:radxa-zero-3e = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"
Quoted 8 lines
recipes-bsp/u-boot/u-boot_%.bbappend require u-boot-rockchip.inc · line 9
Quoted 4 lines
recipes-bsp/u-boot/u-boot_%.bbappend +4
-0+SRC_URI[Kwiboo.sha256sum] = "5d102a658262f6d2d4ea0664fe58b77db4a9eb1ebc89dbd8d6f5e75c9e563810" +SRCREV:radxa-zero-3e = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRCREV:radxa-zero-3e:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +I think a separate recipe here is wiser? They are essentially different sources from a different repo. Although, maybe the generic target is good enough in which case we wouldn't need that at all?
I tried that originally, but the build requires u-boot-extlinux, which can't be satisfied with a new u-boot-kwiboo (?) recipe. I figured the loops to jump through to provide u-boot-extlinux with a new recipe wasn't worth the effort (unless there's some trick I haven't seen before).
Quoted 26 lines
Quoted 8 lines
recipes-bsp/u-boot/u-boot_%.bbappend +0
-0SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a"recipes-kernel/linux/linux-torvalds-next_git.bb new file +0
-0recipes-kernel/linux/linux-torvalds-next_git.bb line 9
Quoted 9 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +9
-0@@ -0,0 +1,22 @@ +inherit kernel +inherit kernel-yocto +require recipes-kernel/linux/linux-yocto.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPLv2"Deprecated, should be
GPL-2.0-onlyrecipes-kernel/linux/linux-torvalds-next_git.bb line 11
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +This is usually at the top of the recipe?
Quoted 4 lines
recipes-kernel/linux/linux-torvalds-next_git.bb line 13
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+ +LINUX_VERSION = "6.10"Isn't it supposed to be 6.11?
It's actually 6.10-rc3, according to the Makefile.
Quoted 11 lines
I would recommend putting
DEFAULT_PREFERENCE= "-1"to make sure it isn't mistakenly pulled implicitly.
Maybe even add a
COMPATIBLE_MACHINEonly for this new board?recipes-kernel/linux/linux-torvalds-next_git.bb line 15
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+KERNEL_VERSION_SANITY_SKIP = "1" +SRCREV = "next-20240611"Please use commit hashes and not tags
I know that's the convention, but is there an explanation for why? A commit hash tells me nothing, but a tag that says "next-20240611" gives me several pieces of information. If it works and it provides useful information, why not use the tag?
Quoted 8 lines
recipes-kernel/linux/linux-torvalds-next_git.bb line 19
Quoted 4 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +4
-0+PV = "${LINUX_VERSION}+git${SRCPV}" +SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master" +SRC_URI[sha256sum] = "3a1c433c4ceffa52f8c3df3aab8c379ff91ca658021d409a528825e5e24580f4" +Is this actually used by Bitbake? It's fetching code through HTTPS via git and git should handle all the integrity there?
Quoted 5 lines
recipes-kernel/linux/linux-torvalds-next_git.bb line 22
Quoted 3 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +3
-0+do_compile:append() { + touch ${B}/Module.symvers +}That seems odd, can you add a comment on why this is required?
This entire kernel recipe comes from an ancient template I had lying around for cases like this. It's entirely done by copying it in and adjusting until it works. I'll give it a more careful pass for #2.
Hi Trevor,
Quoted 4 lines · Trevor Woerner via lists.yoctoproject.org
Quoted 3 lines · Quentin Schulz via lists.yoctoproject.org
Hi Trevor,
On 6/12/24 4:01 AM, Trevor Woerner via lists.yoctoproject.org wrote:
[...]
Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +0
-0@@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62"Quoted 8 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" · line 7
Quoted 3 lines
recipes-bsp/rkbin/rockchip-rkbin_git.bb +1
-0SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" +SRCREV:radxa-zero-3e = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0"Why not bump the whole rockchip-rkbin recipe? Also is there a reason for bumping it? I already see rk3566 blobs in the current git commit. Not against bumping it, would be nice to explain if there's a reason for it other than "newer is better" (which I am a proponent of :) ).
Quoted 5 lines
We've seen cases where newer wasn't better. The newer blobs for rk3308, for example, took away the ability to read the console during this phase. Playing it safe I decided to just bump it for the new device and leave the rest the same.
Fair. Still waiting for Rockchip to release an open-source version of this ddrbin_tool to be able to change a few params of the binary. I was told "they agree to release an opensource version of ddrbin_tool in near future" a month and a half ago. Maybe one day :)
Quoted 3 lines
I'll bump it for all, but I'll have to test on all the ones I care about before submitting.
Better err on the side of caution indeed.
[...]
Quoted 16 lines
Quoted 7 lines
Quoted 7 lines
recipes-bsp/u-boot/u-boot_%.bbappend +1
-0@@ -2,6 +2,11 @@ require u-boot-rockchip.inc FILESEXTRAPATHS:prepend := "${THISDIR}/files:" +SRC_URI:radxa-zero-3e = "git://github.com/Kwiboo/u-boot-rockchip.git;protocol=https;branch=rk3xxx-2024.07;name=Kwiboo"Quoted 8 lines
recipes-bsp/u-boot/u-boot_%.bbappend require u-boot-rockchip.inc · line 9
Quoted 4 lines
recipes-bsp/u-boot/u-boot_%.bbappend +4
-0+SRC_URI[Kwiboo.sha256sum] = "5d102a658262f6d2d4ea0664fe58b77db4a9eb1ebc89dbd8d6f5e75c9e563810" +SRCREV:radxa-zero-3e = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +SRCREV:radxa-zero-3e:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +I think a separate recipe here is wiser? They are essentially different sources from a different repo. Although, maybe the generic target is good enough in which case we wouldn't need that at all?
Quoted 5 lines
I tried that originally, but the build requires u-boot-extlinux, which can't be satisfied with a new u-boot-kwiboo (?) recipe. I figured the loops to jump through to provide u-boot-extlinux with a new recipe wasn't worth the effort (unless there's some trick I haven't seen before).
https://git.embedded.cherry.de/yocto-layers/meta-cherry-es.git/commit/meta-bsp/recipes-bsp/u-boot/u-boot-cherry-es.inc?id=b2a57b4a767a7e77ba430eb2255db79e0aad9996 this is what I did in my tree for my own recipe of downstream U-Boot (you wouldn't need everything, just the anonymous function if I remember correctly).
Quoted 26 lines
Quoted 26 lines
Quoted 8 lines
recipes-bsp/u-boot/u-boot_%.bbappend +0
-0SRC_URI:append:rk-u-boot-env = " file://rockchip-enable-environment-mmc.cfg" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a"recipes-kernel/linux/linux-torvalds-next_git.bb new file +0
-0recipes-kernel/linux/linux-torvalds-next_git.bb line 9
Quoted 9 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +9
-0@@ -0,0 +1,22 @@ +inherit kernel +inherit kernel-yocto +require recipes-kernel/linux/linux-yocto.inc + +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" + +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPLv2"Deprecated, should be
GPL-2.0-onlyrecipes-kernel/linux/linux-torvalds-next_git.bb line 11
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" +This is usually at the top of the recipe?
Quoted 7 lines
Quoted 4 lines
recipes-kernel/linux/linux-torvalds-next_git.bb line 13
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+ +LINUX_VERSION = "6.10"Isn't it supposed to be 6.11?
It's actually 6.10-rc3, according to the
Makefile.
OK, kind of a blurry line here as it is some in-between version which is supposed to become v6.11 one day but is currently just freely based on master branch, whose Makefile version if v6.10-rc<something>.
[...]
Quoted 10 lines
Quoted 4 lines
recipes-kernel/linux/linux-torvalds-next_git.bb line 15
Quoted 2 lines
recipes-kernel/linux/linux-torvalds-next_git.bb new file +2
-0+KERNEL_VERSION_SANITY_SKIP = "1" +SRCREV = "next-20240611"Please use commit hashes and not tags
I know that's the convention, but is there an explanation for why? A commit hash tells me nothing, but a tag that says "next-20240611" gives me several pieces of information. If it works and it provides useful information, why not use the tag?
1) I am surprised this even worked, I was under the impression that only full hashes could be used in SRCREV, but https://docs.yoctoproject.org/ref-manual/variables.html#term-SRCREV only warns you to NOT do it
2) tags are movable git objects, so if it moves after someone has pulled it locally, another person will fetch other sources without even knowing. But the first person rebuilding will never get the new sources.
3) You're supposed to use the ;tag= parameter in the git fetcher for that. This will handle tags moving around so you're sure that if it moves around, you get the new sources, and everybody does. The issue is that it requires network access for every build.
Tags moving around aren't theoretical issues. I worked in a company that has done this multiple times in the few years I worked for them. Yocto Project/OE itself has done this a few times already.
Cheers,
Quentin