Re: [yocto-patches] [meta-rockchip][PATCH v3 3/4] radxa-zero-3w: add

[Trevor Woerner <twoerner@gmail.com>]

On Fri 2024-06-14 @ 10:58:41 AM, Quentin Schulz via lists.yoctoproject.org wrote:
> Hi Trevor,
> 
> On 6/13/24 7:01 PM, Trevor Woerner via lists.yoctoproject.org wrote:
> > 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 30mm
> > 
> > Signed-off-by: Trevor Woerner <twoerner@gmail.com>
> > ---
> > 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
> > 
> > diff --git a/README b/README
> > index a9a040a4308d..909840de2c0d 100644
> > --- a/README
> > +++ b/README
> > @@ -41,6 +41,7 @@ Status of supported boards:
> >   		rock-3a
> >   		rock-4c-plus
> >   		radxa-zero-3e
> > +		radxa-zero-3w
> >   	builds:
> >   		marsboard-rk3066
> >   		radxarock
> > diff --git a/conf/machine/include/radxa-zero-3.inc b/conf/machine/include/radxa-zero-3.inc
> > new file mode 100644
> > index 000000000000..1cdcaa2214fa
> > --- /dev/null
> > +++ b/conf/machine/include/radxa-zero-3.inc
> > @@ -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"
> > diff --git a/conf/machine/include/rk3566.inc b/conf/machine/include/rk3566.inc
> > index 586d68806df6..64d47c004a1f 100644
> > --- a/conf/machine/include/rk3566.inc
> > +++ b/conf/machine/include/rk3566.inc
> > @@ -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?

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!