| Message ID | 20231001130803.18662-2-twoerner@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | rock-pi-s | expand |
Hi Trevor, On 10/1/23 15:08, Trevor Woerner via lists.yoctoproject.org wrote: > Clean up the u-boot bbappend recipe: group items together and re-order as per > the Yocto recipe style guide. > > Signed-off-by: Trevor Woerner <twoerner@gmail.com> > --- > recipes-bsp/u-boot/u-boot%.bbappend | 32 ++++++++++++++--------------- > 1 file changed, 15 insertions(+), 17 deletions(-) > > diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend > index f7800625aaf1..e79c471cf5ce 100644 > --- a/recipes-bsp/u-boot/u-boot%.bbappend > +++ b/recipes-bsp/u-boot/u-boot%.bbappend > @@ -1,27 +1,25 @@ > -do_compile:append:rock2-square () { > - # copy to default search path > - if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then > - cp ${B}/spl/${SPL_BINARY} ${B} > - fi > -} > - > -DEPENDS:append:rock-pi-4 = " gnutls-native" > # various machines require the pyelftools library for parsing dtb files > DEPENDS:append = " python3-pyelftools-native" > +DEPENDS:append:rock-pi-4 = " gnutls-native" > > -INIT_FIRMWARE_DEPENDS ??= "" > - > +EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" > +EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" > +EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" > 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" > > -EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" > -INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" > -EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" > -INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" > -EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" > +INIT_FIRMWARE_DEPENDS ??= "" > INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy" > - > +INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" > +INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" > +INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" > do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}" > + > +do_compile:append:rock2-square () { > + # copy to default search path > + if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then > + cp ${B}/spl/${SPL_BINARY} ${B} > + fi > +} > A bit too many things done at once which makes it difficult to check that no mistake happened. I could suggest to split into multiple commits: 1) move of do_compile override for rock2-square 2) move INIT_FIRMWARE_DEPENDS together 3) move EXTRA_OEMAKE together 4) move rock-pi-4 override But I think there's nothing that sneaked in, so: Reviewed-by: Quentin Schulz <quentin.schulz@theobroma-systems.com> Cheers, Quentin
diff --git a/recipes-bsp/u-boot/u-boot%.bbappend b/recipes-bsp/u-boot/u-boot%.bbappend index f7800625aaf1..e79c471cf5ce 100644 --- a/recipes-bsp/u-boot/u-boot%.bbappend +++ b/recipes-bsp/u-boot/u-boot%.bbappend @@ -1,27 +1,25 @@ -do_compile:append:rock2-square () { - # copy to default search path - if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then - cp ${B}/spl/${SPL_BINARY} ${B} - fi -} - -DEPENDS:append:rock-pi-4 = " gnutls-native" # various machines require the pyelftools library for parsing dtb files DEPENDS:append = " python3-pyelftools-native" +DEPENDS:append:rock-pi-4 = " gnutls-native" -INIT_FIRMWARE_DEPENDS ??= "" - +EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" +EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" +EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" 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" -EXTRA_OEMAKE:append:rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" -INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" -EXTRA_OEMAKE:append:rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" -INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" -EXTRA_OEMAKE:append:px30 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-px30.elf" +INIT_FIRMWARE_DEPENDS ??= "" INIT_FIRMWARE_DEPENDS:px30 = " trusted-firmware-a:do_deploy" - +INIT_FIRMWARE_DEPENDS:rk3328 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3399 = " trusted-firmware-a:do_deploy" +INIT_FIRMWARE_DEPENDS:rk3588s = " rockchip-rkbin:do_deploy" do_compile[depends] .= "${INIT_FIRMWARE_DEPENDS}" + +do_compile:append:rock2-square () { + # copy to default search path + if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then + cp ${B}/spl/${SPL_BINARY} ${B} + fi +}
Clean up the u-boot bbappend recipe: group items together and re-order as per the Yocto recipe style guide. Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- recipes-bsp/u-boot/u-boot%.bbappend | 32 ++++++++++++++--------------- 1 file changed, 15 insertions(+), 17 deletions(-)