rockchip-rkbin: bump SRCREV
PATCH v3 1/4 rockchip-rkbin: bump SRCREV
Update to a newer release.
rk3568:
- update DDR init from version 1.18 → 1.21
rk3588/s:
- the name of the DDR init changed due to upstream adjusting the frequency of the LPDDR5 to 2400MHz to "improve stability" [1]
- reference an exact version instead of using an '*'
- update DDR init from version 1.12 → 1.16
Boot tested on:
- rock-3a
- rock-5a
- rock-5b
Link [1]: https://github.com/rockchip-linux/rkbin/commit/f02d10e468d8c783c45137d230ff33d42ca670b4
---
v3 changes:
- greatly improve the commit message
v2 changes:
- added
- break out the SRCREV bump and make it applicable to all builds/boards
--- recipes-bsp/rkbin/rockchip-rkbin_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
recipes-bsp/rkbin/rockchip-rkbin_git.bb +3 -3
@@ -3,7 +3,7 @@ LICENSE = "Proprietary" LIC_FILES_CHKSUM = "file://LICENSE;md5=15faa4a01e7eb0f5d33f9f2bcc7bff62" SRC_URI = "git://github.com/rockchip-linux/rkbin;protocol=https;branch=master" -SRCREV = "b4558da0860ca48bf1a571dd33ccba580b9abe23" +SRCREV = "a2a0b89b6c8c612dca5ed9ed8a68db8a07f68bc0" PROVIDES += "trusted-firmware-a" PROVIDES += "optee-os"
@@ -42,7 +42,7 @@ do_deploy:rk3568() { # 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.18.bin ${DEPLOYDIR}/ddr-rk3568.bin + install -m 644 ${S}/bin/rk35/rk3568_ddr_1560MHz_v1.21.bin ${DEPLOYDIR}/ddr-rk3568.bin } do_deploy:rk3588s() {
@@ -51,7 +51,7 @@ do_deploy:rk3588s() { # 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 + install -m 644 ${S}/bin/rk35/rk3588_ddr_lp4_2112MHz_lp5_2400MHz_v1.16.bin ${DEPLOYDIR}/ddr-rk3588.bin } do_deploy() {
Signature · 1 line
2.44.0.478.g7774cfed6261
PATCH v3 2/4 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.
---
v3 changes:
- remove sha256sum from u-boot bbappend
- linux-torvalds-next:
- fix COMPATIBLE_MACHINE
- add comment on SRCREV indicating the tag name
v2 changes:
- copy the rk3568-based bl31/bl32 pieces to have rk3566-based names so the rest of the infrastructure works without tweaks
- uncomment/implement the "remove-non-rockchip-arch" kernel scc
- order/sort items
- cleanup/fixup the linux-torvalds-next kernel recipe:
- sort oe items based on the style guide
- remove vestigial bits
- use a commit id instead of a tag name
- update license string
- add DEFAULT_PREFERENCE=-1
- add COMPATIBLE_MACHINE
--- README | 1 + conf/machine/include/rk3566.inc | 21 +++++++++++++++++ conf/machine/radxa-zero-3e.conf | 12 ++++++++++ recipes-bsp/rkbin/rockchip-rkbin_git.bb | 12 ++++++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 4 ++++ .../linux/linux-torvalds-next_git.bb | 23 +++++++++++++++++++ 6 files changed, 73 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 +12 -0
@@ -14,6 +14,7 @@ S = "${WORKDIR}/git" COMPATIBLE_MACHINE = "^$" COMPATIBLE_MACHINE:rk3308 = "rk3308" +COMPATIBLE_MACHINE:rk3566 = "rk3566" COMPATIBLE_MACHINE:rk3568 = "rk3568" COMPATIBLE_MACHINE:rk3588s = "rk3588s"
@@ -36,6 +37,17 @@ do_deploy:rk3308() { install -m 644 ${S}/bin/rk33/rk3308_ddr_589MHz_uart?_m0_v*.bin ${DEPLOYDIR}/ddr-rk3308.bin } +# NOTE: the following are not typos +# the rk3566 uses the same bl31/2 as the rk3568 +do_deploy:rk3566() { + # Prebuilt TF-A + install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3566.elf + # 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 +} + 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_%.bbappend +4 -0
@@ -2,6 +2,10 @@ 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" +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 +23 -0
@@ -0,0 +1,23 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/linux-yocto-dev:" + +DESCRIPTION = "Linux Kernel" +SECTION = "kernel" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" + +DEFAULT_PREFERENCE = "-1" +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE:radxa-zero-3e = "radxa-zero-3e" + +LINUX_VERSION = "6.10-rc3" +PV = "${LINUX_VERSION}+git${SRCPV}" +SRC_URI = " \ + git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git;protocol=https;branch=master \ + file://rockchip-kmeta;type=kmeta;name=rockchip-kmeta;destsuffix=rockchip-kmeta \ + " +# this is tag 'next-20240611' +SRCREV = "a957267fa7e9159d3d2ee1421359ebf228570c68" + +inherit kernel +inherit kernel-yocto +require recipes-kernel/linux/linux-yocto.inc
Signature · 1 line
2.44.0.478.g7774cfed6261
PATCH v3 3/4 radxa-zero-3w: add
In reply to Trevor WoernerThe 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/zero3w/
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
- optional onboard eMMC (8/16/32/64 GB)
- IEEE 802.11 b/g/n/ac/ax(WiFi6), BT5.4 with BLE
- 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
---
v3 changes:
- new
--- README | 1 + conf/machine/include/radxa-zero-3.inc | 6 ++++++ conf/machine/include/rk3566.inc | 1 + conf/machine/radxa-zero-3e.conf | 7 +------ conf/machine/radxa-zero-3w.conf | 7 +++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 6 +++--- recipes-kernel/linux/linux-torvalds-next_git.bb | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 conf/machine/include/radxa-zero-3.inc create mode 100644 conf/machine/radxa-zero-3w.conf
README +1 -0
@@ -41,6 +41,7 @@ Status of supported boards: rock-3a rock-4c-plus radxa-zero-3e + radxa-zero-3w builds: marsboard-rk3066 radxarock
conf/machine/include/radxa-zero-3.inc new file +6 -0
@@ -0,0 +1,6 @@ +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
conf/machine/include/rk3566.inc +1 -0
@@ -5,6 +5,7 @@ DEFAULTTUNE ?= "cortexa55" ROCKCHIP_CLOSED_TPL ?= "1" require conf/machine/include/soc-family.inc +MACHINEOVERRIDES .= "${@bb.utils.contains_any('MACHINE', 'radxa-zero-3e radxa-zero-3w', ':radxa-zero-3', '', d)}" require conf/machine/include/rockchip-defaults.inc require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc require conf/machine/include/rockchip-wic.inc
conf/machine/radxa-zero-3e.conf +1 -6
@@ -3,10 +3,5 @@ #@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" +require conf/machine/include/radxa-zero-3.inc KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3e.dtb" -MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" - -UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"
conf/machine/radxa-zero-3w.conf new file +7 -0
@@ -0,0 +1,7 @@ +#@TYPE: Machine +#@NAME: Radxa Zero 3W +#@DESCRIPTION: The Radxa ZERO 3w 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/zero3w/ + +require conf/machine/include/radxa-zero-3.inc +KERNEL_DEVICETREE = "rockchip/rk3566-radxa-zero-3w.dtb"
recipes-bsp/u-boot/u-boot_%.bbappend +3 -3
@@ -2,9 +2,9 @@ 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" -SRCREV:radxa-zero-3e = "8cdf606e616baa36751f3b4adcfaefc781126c8c" -SRCREV:radxa-zero-3e:rk-u-boot-env = "8cdf606e616baa36751f3b4adcfaefc781126c8c" +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" SRCREV:rk-u-boot-env = "cdfcc37428e06f4730ab9a17cc084eeb7676ea1a"
recipes-kernel/linux/linux-torvalds-next_git.bb +1 -1
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEFAULT_PREFERENCE = "-1" COMPATIBLE_MACHINE = "^$" -COMPATIBLE_MACHINE:radxa-zero-3e = "radxa-zero-3e" +COMPATIBLE_MACHINE:radxa-zero-3 = "radxa-zero-3" LINUX_VERSION = "6.10-rc3" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.44.0.478.g7774cfed6261
PATCH v3 4/4 README: sort MACHINE names
In reply to Trevor WoernerPreviously the MACHINEs were listed in the order in which they were added to the layer. Going forward, separate the list into 32 vs 64 bit, sort each of those groups, while distinguishing between which boards support wic and which don't.
---
v3 changes:
- new
--- README | 59 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 27 deletions(-)
README +32 -27
@@ -18,34 +18,39 @@ Dependencies: Status of supported boards: -------------------------- builds and boots wic image: - nanopi-m4 - nanopi-m4-2gb - rock-pi-e - rock-pi-4a - rock-pi-4b - rock-pi-4c - rock64 - tinker-board - tinker-board-s - vyasa-rk3288 - firefly-rk3288 - nanopi-r4s - rock-5b - nanopi-r2s - nanopi-m4b - rock-pi-s - rock-5a - roc-rk3328-cc - roc-rk3308-cc - orangepi-5-plus - rock-3a - rock-4c-plus - radxa-zero-3e - radxa-zero-3w + 32-bit: + firefly-rk3288 + tinker-board + tinker-board-s + vyasa-rk3288 + + 64-bit: + nanopi-m4 + nanopi-m4-2gb + nanopi-m4b + nanopi-r2s + nanopi-r4s + orangepi-5-plus + radxa-zero-3e + radxa-zero-3w + roc-rk3308-cc + roc-rk3328-cc + rock-3a + rock-4c-plus + rock-5a + rock-5b + rock-pi-4a + rock-pi-4b + rock-pi-4c + rock-pi-e + rock-pi-s + rock64 + builds: - marsboard-rk3066 - radxarock - rock2-square + 32-bit: + marsboard-rk3066 + radxarock + rock2-square Notes: -----
Signature · 1 line
2.44.0.478.g7774cfed6261
Re: [yocto-patches] [meta-rockchip][PATCH v3 3/4] radxa-zero-3w: add
In reply to Trevor WoernerHi Trevor,
Quoted 63 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/zero3w/
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
- optional onboard eMMC (8/16/32/64 GB)
- IEEE 802.11 b/g/n/ac/ax(WiFi6), BT5.4 with BLE
- 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 30mmSigned-off-by Trevor Woerner <[email protected]>---
v3 changes:
- new--- README | 1 + conf/machine/include/radxa-zero-3.inc | 6 ++++++ conf/machine/include/rk3566.inc | 1 + conf/machine/radxa-zero-3e.conf | 7 +------ conf/machine/radxa-zero-3w.conf | 7 +++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 6 +++--- recipes-kernel/linux/linux-torvalds-next_git.bb | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-)create mode 100644 conf/machine/include/radxa-zero-3.inc create mode 100644
conf/machine/radxa-zero-3w.confREADME +1
-0@@ -41,6 +41,7 @@ Status of supported boards: rock-3a rock-4c-plus radxa-zero-3e + radxa-zero-3w builds: marsboard-rk3066 radxarockconf/machine/include/radxa-zero-3.inc new file +6
-0@@ -0,0 +1,6 @@ +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"conf/machine/include/rk3566.inc +0
-0
conf/machine/include/rk3566.inc DEFAULTTUNE ?= "cortexa55" · line 8
Quoted 4 lines
conf/machine/include/rk3566.inc +1
-0@@ -5,6 +5,7 @@ DEFAULTTUNE ?= "cortexa55" ROCKCHIP_CLOSED_TPL ?= "1" require conf/machine/include/soc-family.inc +MACHINEOVERRIDES .= "${@bb.utils.contains_any('MACHINE', 'radxa-zero-3e radxa-zero-3w', ':radxa-zero-3', '', d)}"
No need to pollute the rk3566 with this, I assume you could simply add:
MACHINEOVERRIDES =. "radxa-zero-3:"
in conf/machine/include/radxa-zero-3.inc
similarly to what's done in https://git.yoctoproject.org/meta-rockchip/tree/conf/machine/include/rock-pi-4.inc
?
Or is this somehow messing up with the MACHINEOVERRIDES order?
Looks good to me otherwise,
Cheers,
Quentin
Re: [yocto-patches] [meta-rockchip][PATCH v3 4/4] README: sort MACHINE names
In reply to Trevor WoernerHi Trevor,
Quoted 6 lines · Trevor Woerner via lists.yoctoproject.org
Previously the MACHINEs were listed in the order in which they were added to the layer. Going forward, separate the list into 32 vs 64 bit, sort each of those groups, while distinguishing between which boards support wic and which don't.
Signed-off-by Trevor Woerner <[email protected]>
Thanks!
Quentin
Re: [yocto-patches] [meta-rockchip][PATCH v3 3/4] radxa-zero-3w: add
In reply to Quentin SchulzQuoted 72 lines · Quentin Schulz via lists.yoctoproject.org
Hi Trevor,
Quoted 63 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/zero3w/
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
- optional onboard eMMC (8/16/32/64 GB)
- IEEE 802.11 b/g/n/ac/ax(WiFi6), BT5.4 with BLE
- 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 30mmSigned-off-by Trevor Woerner <[email protected]>---
v3 changes:
- new--- README | 1 + conf/machine/include/radxa-zero-3.inc | 6 ++++++ conf/machine/include/rk3566.inc | 1 + conf/machine/radxa-zero-3e.conf | 7 +------ conf/machine/radxa-zero-3w.conf | 7 +++++++ recipes-bsp/u-boot/u-boot_%.bbappend | 6 +++--- recipes-kernel/linux/linux-torvalds-next_git.bb | 2 +- 7 files changed, 20 insertions(+), 10 deletions(-)create mode 100644 conf/machine/include/radxa-zero-3.inc create mode 100644
conf/machine/radxa-zero-3w.confREADME +1
-0@@ -41,6 +41,7 @@ Status of supported boards: rock-3a rock-4c-plus radxa-zero-3e + radxa-zero-3w builds: marsboard-rk3066 radxarockconf/machine/include/radxa-zero-3.inc new file +6
-0@@ -0,0 +1,6 @@ +require conf/machine/include/rk3566.inc + +PREFERRED_PROVIDER_virtual/kernel = "linux-torvalds-next" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" + +UBOOT_MACHINE = "radxa-zero-3-rk3566_defconfig"conf/machine/include/rk3566.inc +0
-0conf/machine/include/rk3566.inc DEFAULTTUNE ?= "cortexa55" · line 7
Quoted 3 lines
conf/machine/include/rk3566.inc +1
-0@@ -5,6 +5,7 @@ DEFAULTTUNE ?= "cortexa55" ROCKCHIP_CLOSED_TPL ?= "1" require conf/machine/include/soc-family.inc +MACHINEOVERRIDES .= "${@bb.utils.contains_any('MACHINE', 'radxa-zero-3e radxa-zero-3w', ':radxa-zero-3', '', d)}"No need to pollute the rk3566 with this, I assume you could simply add:
Quoted 8 lines
MACHINEOVERRIDES =. "radxa-zero-3:"
in conf/machine/include/radxa-zero-3.inc
similarly to what's done in https://git.yoctoproject.org/meta-rockchip/tree/conf/machine/include/rock-pi-4.inc
?Or is this somehow messing up with the MACHINEOVERRIDES order?
For some reason i wanted:
MACHINEOVERRIDES="aarch64:rockchip:closed-tpl:rk3566:radxa-zero-3e:radxa-zero-3:rk-u-boot-env"
but you're right, it should be:
MACHINEOVERRIDES="aarch64:rockchip:closed-tpl:rk3566:radxa-zero-3:radxa-zero-3e:rk-u-boot-env"
I adjusted it and pushed the whole series to the master branch. Thanks!