MIRRORS/meta-rockchip
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-rockchip.git synced 2025-07-04 20:54:48 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

bsp: rkbin: factor out do_deploy and RKBIN_BINDIR variable

Browse Source 
do_deploy is now identical for all recipes including rockchip-rkbin.inc
so let's simply move it to the .inc file to avoid duplication.

While at it, RKBIN_BINDIR is also identical so can also be moved to the
.inc, so do it.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
This commit is contained in:
Quentin Schulz 2025-05-05 16:20:44 +02:00 committed by Trevor Woerner
parent c002bdcf2e
commit 7f6584f4ee
4 changed files with 18 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
recipes-bsp/rkbin/rockchip-rkbin-ddr_git.bb
View File

@ -2,22 +2,18 @@ DESCRIPTION = "Rockchip Firmware for DDR init (TPL in U-Boot terms)"
require rockchip-rkbin.inc
RKBIN_BINDIR:rk3308 ?= "bin/rk33/"
RKBIN_BINVERS:rk3308 ?= "v2.10"
RKBIN_BINFILE:rk3308 ?= "rk3308_ddr_589MHz_uart4_m0_${RKBIN_BINVERS}.bin"
RKBIN_DEPLOY_FILENAME:rk3308 ?= "ddr-rk3308.bin"
RKBIN_BINDIR:rk3566 ?= "bin/rk35/"
RKBIN_BINVERS:rk3566 ?= "v1.23"
RKBIN_BINFILE:rk3566 ?= "rk3566_ddr_1056MHz_${RKBIN_BINVERS}.bin"
RKBIN_DEPLOY_FILENAME:rk3566 ?= "ddr-rk3566.bin"
RKBIN_BINDIR:rk3568 ?= "bin/rk35/"
RKBIN_BINVERS:rk3568 ?= "v1.23"
RKBIN_BINFILE:rk3568 ?= "rk3568_ddr_1560MHz_${RKBIN_BINVERS}.bin"
RKBIN_DEPLOY_FILENAME:rk3568 ?= "ddr-rk3568.bin"
RKBIN_BINDIR:rk3588s ?= "bin/rk35/"
RKBIN_BINVERS:rk3588s ?= "v1.18"
RKBIN_BINFILE:rk3588s ?= "rk3588_ddr_lp4_2112MHz_lp5_2400MHz_${RKBIN_BINVERS}.bin"
RKBIN_DEPLOY_FILENAME:rk3588s ?= "ddr-rk3588.bin"
@ -27,23 +23,6 @@ DDRBIN_TOOL_SOC:rk3308 ?= "rk3308"
DDRBIN_TOOL_SOC:rk3566 ?= "rk356x"
DDRBIN_TOOL_SOC:rk3588s ?= "rk3588"
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
# Prebuilt U-Boot TPL (DDR init)
install -m 644 ${S}/${RKBIN_BINDIR}${RKBIN_BINFILE} ${DEPLOYDIR}/${RKBIN_DEPLOY_FILENAME}
}
# The following is only required if DDR bin blob needs to be modified
# (e.g. different UART controller, UART mux, or baudrate)
# RKBIN_DDR_RECONFIGURE = "1" if it needs to be modified, all below logic needs to

21
recipes-bsp/rkbin/rockchip-rkbin-optee-os_git.bb
View File

@ -4,42 +4,21 @@ require rockchip-rkbin.inc
PROVIDES += "optee-os"
RKBIN_BINDIR:rk3308 ?= "bin/rk33/"
RKBIN_BINVERS:rk3308 ?= "v2.08"
RKBIN_BINFILE:rk3308 ?= "rk3308_bl32_${RKBIN_BINVERS}.bin"
RKBIN_DEPLOY_FILENAME:rk3308 ?= "tee-rk3308.bin"
RKBIN_BINVERS_RK356x ?= "v2.14"
RKBIN_BINDIR:rk3566 ?= "bin/rk35/"
RKBIN_BINVERS:rk3566 ?= "${RKBIN_BINVERS_RK356x}"
# NOTE: the following are not typos
# the rk3566 uses the same bl32 as the rk3568
RKBIN_BINFILE:rk3566 ?= "rk3568_bl32_${RKBIN_BINVERS}.bin"
RKBIN_DEPLOY_FILENAME:rk3566 ?= "tee-rk3566.bin"
RKBIN_BINDIR:rk3568 ?= "bin/rk35/"
RKBIN_BINVERS:rk3568 ?= "${RKBIN_BINVERS_RK356x}"
RKBIN_BINFILE:rk3568 ?= "rk3568_bl32_${RKBIN_BINVERS}.bin"
RKBIN_DEPLOY_FILENAME:rk3568 ?= "tee-rk3568.bin"
RKBIN_BINDIR:rk3588s ?= "bin/rk35/"
RKBIN_BINVERS:rk3588s ?= "v1.17"
RKBIN_BINFILE:rk3588s ?= "rk3588_bl32_${RKBIN_BINVERS}.bin"
RKBIN_DEPLOY_FILENAME:rk3588s ?= "tee-rk3588.bin"
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
# Prebuilt OPTEE-OS
install -m 644 ${S}/${RKBIN_BINDIR}${RKBIN_BINFILE} ${DEPLOYDIR}/${RKBIN_DEPLOY_FILENAME}
}

21
recipes-bsp/rkbin/rockchip-rkbin-tf-a_git.bb
View File

@ -4,42 +4,21 @@ require rockchip-rkbin.inc
PROVIDES += "trusted-firmware-a"
RKBIN_BINDIR:rk3308 ?= "bin/rk33/"
RKBIN_BINVERS:rk3308 ?= "v2.26"
RKBIN_BINFILE:rk3308 ?= "rk3308_bl31_${RKBIN_BINVERS}.elf"
RKBIN_DEPLOY_FILENAME:rk3308 ?= "bl31-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
RKBIN_BINFILE:rk3566 ?= "rk3568_bl31_${RKBIN_BINVERS}.elf"
RKBIN_DEPLOY_FILENAME:rk3566 ?= "bl31-rk3566.elf"
RKBIN_BINDIR:rk3568 ?= "bin/rk35/"
RKBIN_BINVERS:rk3568 ?= "${RKBIN_BINVERS_RK356x}"
RKBIN_BINFILE:rk3568 ?= "rk3568_bl31_${RKBIN_BINVERS}.elf"
RKBIN_DEPLOY_FILENAME:rk3568 ?= "bl31-rk3568.elf"
RKBIN_BINDIR:rk3588s ?= "bin/rk35/"
RKBIN_BINVERS:rk3588s ?= "v1.47"
RKBIN_BINFILE:rk3588s ?= "rk3588_bl31_${RKBIN_BINVERS}.elf"
RKBIN_DEPLOY_FILENAME:rk3588s ?= "bl31-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
# Prebuilt TF-A
install -m 644 ${S}/${RKBIN_BINDIR}${RKBIN_BINFILE} ${DEPLOYDIR}/${RKBIN_DEPLOY_FILENAME}
}

19
recipes-bsp/rkbin/rockchip-rkbin.inc
View File

@ -25,8 +25,25 @@ do_install() {
PACKAGES = "${PN}"
ALLOW_EMPTY:${PN} = "1"
RKBIN_BINDIR:rk3308 ?= "bin/rk33/"
RKBIN_BINDIR:rk3566 ?= "bin/rk35/"
RKBIN_BINDIR:rk3568 ?= "bin/rk35/"
RKBIN_BINDIR:rk3588s ?= "bin/rk35/"
do_deploy() {
bbfatal "COMPATIBLE_MACHINE requires a corresponding do_deploy:<MACHINE>() override"
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
install -m 644 ${S}/${RKBIN_BINDIR}${RKBIN_BINFILE} ${DEPLOYDIR}/${RKBIN_DEPLOY_FILENAME}
}
addtask deploy after do_install