Re: [meta-rockchip][PATCH v4 2/2] rock-5b: add

[Trevor Woerner <twoerner@gmail.com>]

Hi Quentin,

On Wed 2023-09-27 @ 09:59:57 AM, Quentin Schulz wrote:
> Hi Trevor,
> 
> On 9/27/23 04:42, Trevor Woerner wrote:
> [...]
> > 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
> > diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend
> > index 050f55e124d4..f7800625aaf1 100644
> > --- a/recipes-bsp/u-boot/u-boot%.bbappend
> > +++ b/recipes-bsp/u-boot/u-boot%.bbappend
> > @@ -11,6 +11,12 @@ DEPENDS:append = " python3-pyelftools-native"
> >   INIT_FIRMWARE_DEPENDS ??= ""
> > +EXTRA_OEMAKE:append:rk3588s = " \
> > +	BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3588.elf \
> > +	ROCKCHIP_TPL=${DEPLOY_DIR_IMAGE}/ddr-rk3588.bin \
> > +	"
> > +INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy"
> > +
> 
> Mmmmmm thinking about this... I think we'll have a difficult time allowing
> rkbin for ddr.bin and upstream trusted-firmware-a from another recipe for
> bl31.elf because both would be installing the same bl31 file in the deploy
> directory. I guess we can postpone this problem until we have to handle it
> though because nothing comes to mind on how to handle this properly right
> now.

If/when that time comes, we could tweak the do_install()s of rockchip-rkbin
and/or tf-a to install or not install various pieces as required by the
specific case.

Thanks for reviewing!