| Message ID | 20250418-ddrbin-custom-v2-7-700828527faf@cherry.de |
|---|---|
| State | New |
| Headers | show |
| Series | rkbin: factoring do_deploy, customize ddrbin and bump rkbin | expand |
Hi Trevor, On 4/18/25 4:50 PM, Quentin Schulz wrote: > From: Quentin Schulz <quentin.schulz@cherry.de> > > The do_deploy task is essentially the same for all SoCs, install a file > from a specific path to another one. > > No magic involved, so let's rather have one generic do_deploy task. For > this to work nicely, we check that all necessary variables are set and > notify the developer otherwise. This may be useful whenever a new SoC > will be supported by this recipe. > > Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de> > --- > recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb | 46 +++++++++++++++++++--------- > 1 file changed, 32 insertions(+), 14 deletions(-) > > diff --git a/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb b/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb > index 0ed28a2f18daae280fe38e6939f1b4742b29a778..e6c3199c9fc06aa88173aaa42f2bc8cd365551a8 100644 > --- a/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb > +++ b/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb > @@ -4,24 +4,42 @@ require rockchip-rkbin.inc > > PROVIDES += "trusted-firmware-a" > > -do_deploy:rk3308() { > - # Prebuilt TF-A > - install -m 644 ${S}/bin/rk33/rk3308_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3308.elf > -} > +RKBIN_BINDIR:rk3308 ?= "bin/rk33/" > +RKBIN_BINVERS:rk3308 ?= "v2.26" > +RKBIN_BINFILE:rk3308 ?= "rk3308_bl31_${RKBIN_BINVERS}.elf" > +RKBIN_DEPLOY_FILENAME:rk3308 ?= "tee-rk3308.elf" Someone clearly made an oopsie there :) Should be bl31- instead of tee-. Will send a v3 fixing that, sorry for the noise. Will test build with U-Boot now instead of simply building rockchip-rkbin-* recipes :) Cheers, Quentin
diff --git a/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb b/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb index 0ed28a2f18daae280fe38e6939f1b4742b29a778..e6c3199c9fc06aa88173aaa42f2bc8cd365551a8 100644 --- a/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb +++ b/recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb @@ -4,24 +4,42 @@ require rockchip-rkbin.inc PROVIDES += "trusted-firmware-a" -do_deploy:rk3308() { - # Prebuilt TF-A - install -m 644 ${S}/bin/rk33/rk3308_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3308.elf -} +RKBIN_BINDIR:rk3308 ?= "bin/rk33/" +RKBIN_BINVERS:rk3308 ?= "v2.26" +RKBIN_BINFILE:rk3308 ?= "rk3308_bl31_${RKBIN_BINVERS}.elf" +RKBIN_DEPLOY_FILENAME:rk3308 ?= "tee-rk3308.elf" +RKBIN_BINVERS_RK356x ?= "v1.44" +RKBIN_BINDIR:rk3566 ?= "bin/rk35/" +RKBIN_BINVERS:rk3566 ?= "${RKBIN_BINVERS_RK356x}" # NOTE: the following are not typos # the rk3566 uses the same bl31 as the rk3568 -do_deploy:rk3566() { - # Prebuilt TF-A - install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3566.elf -} +RKBIN_BINFILE:rk3566 ?= "rk3568_bl31_${RKBIN_BINVERS}.elf" +RKBIN_DEPLOY_FILENAME:rk3566 ?= "tee-rk3566.elf" -do_deploy:rk3568() { - # Prebuilt TF-A - install -m 644 ${S}/bin/rk35/rk3568_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3568.elf -} +RKBIN_BINDIR:rk3568 ?= "bin/rk35/" +RKBIN_BINVERS:rk3568 ?= "${RKBIN_BINVERS_RK356x}" +RKBIN_BINFILE:rk3568 ?= "rk3568_bl31_${RKBIN_BINVERS}.elf" +RKBIN_DEPLOY_FILENAME:rk3568 ?= "tee-rk3568.elf" + +RKBIN_BINDIR:rk3588s ?= "bin/rk35/" +RKBIN_BINVERS:rk3588s ?= "v1.47" +RKBIN_BINFILE:rk3588s ?= "rk3588_bl31_${RKBIN_BINVERS}.elf" +RKBIN_DEPLOY_FILENAME:rk3588s ?= "tee-rk3588.elf" + +do_deploy() { + if [ -z "${RKBIN_BINDIR}" ]; then + bbfatal "Non-empty RKBIN_BINDIR:<MACHINE> required!" + fi + + if [ -z "${RKBIN_BINFILE}" ]; then + bbfatal "Non-empty RKBIN_BINFILE:<MACHINE> required!" + fi + + if [ -z "${RKBIN_DEPLOY_FILENAME}" ]; then + bbfatal "Non-empty RKBIN_DEPLOY_FILENAME:<MACHINE> required!" + fi -do_deploy:rk3588s() { # Prebuilt TF-A - install -m 644 ${S}/bin/rk35/rk3588_bl31_v*.elf ${DEPLOYDIR}/bl31-rk3588.elf + install -m 644 ${S}/${RKBIN_BINDIR}${RKBIN_BINFILE} ${DEPLOYDIR}/${RKBIN_DEPLOY_FILENAME} }